<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9837">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: replace packet statistic counters with libosmocore rate counters<br><br>In struct mgcp_rtp_end one finds unsigned int counters. Those should<br>be replaced with libosmocore rate counters<br><br>- replace packets_rx, octets_rx, packets_tx, octets_tx and<br> dropped_packets with libosmocore rate counters.<br><br>Change-Id: I47c5c9006df5044e59ddebb895e62adb849d72d5<br>Related: OS#2517<br>---<br>M include/osmocom/mgcp/mgcp_internal.h<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_stat.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>M tests/mgcp/mgcp_test.c<br>6 files changed, 37 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/37/9837/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index 1b9749d..1e0421a 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -101,11 +101,11 @@</span><br><span> struct mgcp_rtp_end {</span><br><span> /* statistics */</span><br><span> struct {</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int packets_rx;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int octets_rx;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int packets_tx;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int octets_tx;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int dropped_packets;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *packets_rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *octets_rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *packets_tx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *octets_tx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *dropped_packets;</span><br><span> } stats;</span><br><span> </span><br><span> /* local IP address of the RTP socket */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index e49559c..3943c69 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -34,19 +34,28 @@</span><br><span> enum {</span><br><span> IN_STREAM_ERR_TSTMP_CTR,</span><br><span> OUT_STREAM_ERR_TSTMP_CTR,</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_PACKETS_RX_CTR,</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_OCTETS_RX_CTR,</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_PACKETS_TX_CTR,</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_OCTETS_TX_CTR,</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_DROPPED_PACKETS_CTR</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc rate_ctr_desc[] = {</span><br><span> [IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."},</span><br><span> [OUT_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:out", "Outbound rtp-stream timestamp errors."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_PACKETS_RX_CTR] = {"rtp:packets_rx", "Inbound rtp packets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_OCTETS_RX_CTR] = {"rtp:octets_rx", "Inbound rtp octets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_PACKETS_TX_CTR] = {"rtp:packets_tx", "Outbound rtp packets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_OCTETS_TX_CTR] = {"rtp:octets_rx", "Outbound rtp octets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_DROPPED_PACKETS_CTR] = {"rtp:dropped", "dropped rtp packets."}</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> const static struct rate_ctr_group_desc rate_ctr_group_desc = {</span><br><span> .group_name_prefix = "conn_rtp",</span><br><span> .group_description = "rtp connection statistics",</span><br><span> .class_id = 1,</span><br><span style="color: hsl(0, 100%, 40%);">- .num_ctr = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_ctr = ARRAY_SIZE(rate_ctr_desc),</span><br><span> .ctr_desc = rate_ctr_desc</span><br><span> };</span><br><span> </span><br><span>@@ -121,6 +130,12 @@</span><br><span> conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index);</span><br><span> conn_rtp->state.in_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[IN_STREAM_ERR_TSTMP_CTR];</span><br><span> conn_rtp->state.out_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[OUT_STREAM_ERR_TSTMP_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_rtp->end.stats.packets_rx = &conn_rtp->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_rtp->end.stats.octets_rx = &conn_rtp->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_rtp->end.stats.packets_tx = &conn_rtp->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_rtp->end.stats.octets_tx = &conn_rtp->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_rtp->end.stats.dropped_packets = &conn_rtp->rate_ctr_group->ctr[RTP_DROPPED_PACKETS_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rate_ctr_index++;</span><br><span> </span><br><span> /* Make sure codec table is reset */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index b47b76c..2bcf4c2 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -694,7 +694,7 @@</span><br><span> dest_name = conn_dst->conn->name;</span><br><span> </span><br><span> if (!rtp_end->output_enabled) {</span><br><span style="color: hsl(0, 100%, 40%);">- rtp_end->stats.dropped_packets += 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(rtp_end->stats.dropped_packets);</span><br><span> LOGP(DRTP, LOGL_DEBUG,</span><br><span> "endpoint:0x%x output disabled, drop to %s %s "</span><br><span> "rtp_port:%u rtcp_port:%u\n",</span><br><span>@@ -749,8 +749,8 @@</span><br><span> if (len <= 0)</span><br><span> return len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- conn_dst->end.stats.packets_tx += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_dst->end.stats.octets_tx += len;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(conn_dst->end.stats.packets_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(conn_dst->end.stats.octets_tx, len);</span><br><span> </span><br><span> nbytes += len;</span><br><span> buflen = cont;</span><br><span>@@ -939,8 +939,8 @@</span><br><span> }</span><br><span> </span><br><span> /* Increment RX statistics */</span><br><span style="color: hsl(0, 100%, 40%);">- conn->end.stats.packets_rx += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->end.stats.octets_rx += rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(conn->end.stats.packets_rx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(conn->end.stats.octets_rx, rc);</span><br><span> </span><br><span> /* Forward a copy of the RTP data to a debug ip/port */</span><br><span> forward_data(fd->fd, &conn->tap_in, buf, rc);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c</span><br><span>index cc723bb..97c354a 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_stat.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_stat.c</span><br><span>@@ -44,8 +44,8 @@</span><br><span> * Make sure the sign is correct and use the biggest</span><br><span> * positive/negative number that fits.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- *loss = *expected - end->stats.packets_rx;</span><br><span style="color: hsl(0, 100%, 40%);">- if (*expected < end->stats.packets_rx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ *loss = *expected - end->stats.packets_rx->current;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*expected < end->stats.packets_rx->current) {</span><br><span> if (*loss > 0)</span><br><span> *loss = INT_MIN;</span><br><span> } else {</span><br><span>@@ -74,9 +74,9 @@</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=%u, OS=%u, PR=%u, OR=%u, PL=%d, JI=%u",</span><br><span style="color: hsl(0, 100%, 40%);">- conn->end.stats.packets_tx, conn->end.stats.octets_tx,</span><br><span style="color: hsl(0, 100%, 40%);">- conn->end.stats.packets_rx, conn->end.stats.octets_rx,</span><br><span style="color: hsl(120, 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%);">+ conn->end.stats.packets_tx->current, conn->end.stats.octets_tx->current,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->end.stats.packets_rx->current, conn->end.stats.octets_rx->current,</span><br><span> ploss, jitter);</span><br><span> if (nchars < 0 || nchars >= str_len)</span><br><span> goto truncate;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index a7a1feb..a579b16 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -161,7 +161,7 @@</span><br><span> </span><br><span> vty_out(vty,</span><br><span> " Timestamp Errs: %lu->%lu%s"</span><br><span style="color: hsl(0, 100%, 40%);">- " Dropped Packets: %d%s"</span><br><span style="color: hsl(120, 100%, 40%);">+ " Dropped Packets: %lu%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>@@ -170,7 +170,7 @@</span><br><span> state->in_stream.err_ts_ctr->current,</span><br><span> state->out_stream.err_ts_ctr->current,</span><br><span> VTY_NEWLINE,</span><br><span style="color: hsl(0, 100%, 40%);">- end->stats.dropped_packets, VTY_NEWLINE,</span><br><span style="color: hsl(120, 100%, 40%);">+ end->stats.dropped_packets->current, VTY_NEWLINE,</span><br><span> codec->payload_type, codec->rate, codec->channels, VTY_NEWLINE,</span><br><span> codec->frame_duration_num, codec->frame_duration_den,</span><br><span> VTY_NEWLINE, end->frames_per_packet, end->packet_duration_ms,</span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 1d2cf4a..7af1d23 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -944,15 +944,17 @@</span><br><span> int loss;</span><br><span> struct mgcp_rtp_state state;</span><br><span> struct mgcp_rtp_end rtp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr packets_rx;</span><br><span> memset(&state, 0, sizeof(state));</span><br><span> memset(&rtp, 0, sizeof(rtp));</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp.stats.packets_rx = &packets_rx;</span><br><span> </span><br><span> state.stats.initialized = 1;</span><br><span> state.stats.base_seq = pl_test_dat[i].base_seq;</span><br><span> state.stats.max_seq = pl_test_dat[i].max_seq;</span><br><span> state.stats.cycles = pl_test_dat[i].cycles;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rtp.stats.packets_rx = pl_test_dat[i].packets;</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp.stats.packets_rx->current = pl_test_dat[i].packets;</span><br><span> calc_loss(&state, &rtp, &expected, &loss);</span><br><span> </span><br><span> if (loss != pl_test_dat[i].loss</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9837">change 9837</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/9837"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I47c5c9006df5044e59ddebb895e62adb849d72d5 </div>
<div style="display:none"> Gerrit-Change-Number: 9837 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>