<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9931">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stat+vty: fix printing of rate counter values<br><br>When creating the mgcp statistics (DLCX) and also when printing<br>values in the VTY. The printf placeholder %lu is used. However,<br>this is not portable when the same code is compiled on a machine<br>with different integer size (e.g. armv7).<br><br>- Use PRIu64 when printing ->current value of the rate counters<br><br>Change-Id: Ifb8944cec83868845f74ad84551eb090f812daf8<br>---<br>M src/libosmo-mgcp/mgcp_stat.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>2 files changed, 6 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c</span><br><span>index 4072ac0..3685cfe 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_stat.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_stat.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include <osmocom/mgcp/mgcp_stat.h></span><br><span> #include <osmocom/mgcp/mgcp_endp.h></span><br><span> #include <limits.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span> </span><br><span> /* Helper function for mgcp_format_stats_rtp() to calculate packet loss */</span><br><span> void calc_loss(struct mgcp_conn_rtp *conn, uint32_t *expected, int *loss)</span><br><span>@@ -80,7 +81,7 @@</span><br><span> jitter = calc_jitter(&conn->state);</span><br><span> </span><br><span> nchars = snprintf(str, str_len,</span><br><span style="color: hsl(0, 100%, 40%);">- "\r\nP: PS=%lu, OS=%lu, PR=%lu, OR=%lu, PL=%d, JI=%u",</span><br><span style="color: hsl(120, 100%, 40%);">+ "\r\nP: PS=%" PRIu64 ", OS=%" PRIu64 ", PR=%" PRIu64 ", OR=%" PRIu64 ", PL=%d, JI=%u",</span><br><span> packets_tx->current, octets_tx->current,</span><br><span> packets_rx->current, octets_rx->current,</span><br><span> ploss, jitter);</span><br><span>@@ -93,7 +94,7 @@</span><br><span> if (conn->conn->endp->cfg->osmux != OSMUX_USAGE_OFF) {</span><br><span> /* Error Counter */</span><br><span> nchars = snprintf(str, str_len,</span><br><span style="color: hsl(0, 100%, 40%);">- "\r\nX-Osmo-CP: EC TI=%lu, TO=%lu",</span><br><span style="color: hsl(120, 100%, 40%);">+ "\r\nX-Osmo-CP: EC TI=%" PRIu64 ", TO=%" PRIu64,</span><br><span> conn->state.in_stream.err_ts_ctr->current,</span><br><span> conn->state.out_stream.err_ts_ctr->current);</span><br><span> if (nchars < 0 || nchars >= str_len)</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index b586ff6..ad462b7 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> #include <osmocom/mgcp/mgcp_endp.h></span><br><span> </span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span> </span><br><span> #define RTCP_OMIT_STR "Drop RTCP packets in both directions\n"</span><br><span> #define RTP_PATCH_STR "Modify RTP packet header in both directions\n"</span><br><span>@@ -164,8 +165,8 @@</span><br><span> dropped_packets = &conn->rate_ctr_group->ctr[RTP_DROPPED_PACKETS_CTR];</span><br><span> </span><br><span> vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">- " Timestamp Errs: %lu->%lu%s"</span><br><span style="color: hsl(0, 100%, 40%);">- " Dropped Packets: %lu%s"</span><br><span style="color: hsl(120, 100%, 40%);">+ " Timestamp Errs: %" PRIu64 "->%" PRIu64 "%s"</span><br><span style="color: hsl(120, 100%, 40%);">+ " Dropped Packets: %" PRIu64 "%s"</span><br><span> " Payload Type: %d Rate: %u Channels: %d %s"</span><br><span> " Frame Duration: %u Frame Denominator: %u%s"</span><br><span> " FPP: %d Packet Duration: %u%s"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9931">change 9931</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9931"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifb8944cec83868845f74ad84551eb090f812daf8 </div>
<div style="display:none"> Gerrit-Change-Number: 9931 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>