<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9837">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><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_conn.h<br>M include/osmocom/mgcp/mgcp_internal.h<br>M include/osmocom/mgcp/mgcp_stat.h<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_osmux.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>9 files changed, 86 insertions(+), 55 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h</span><br><span>index e2a423f..3da7334 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_conn.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_conn.h</span><br><span>@@ -27,6 +27,17 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <inttypes.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* RTP connection related counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ IN_STREAM_ERR_TSTMP_CTR,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp,</span><br><span> enum mgcp_conn_type type, char *name);</span><br><span> struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id);</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index 1b9749d..38b687c 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -99,15 +99,6 @@</span><br><span> </span><br><span> /* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */</span><br><span> struct mgcp_rtp_end {</span><br><span style="color: hsl(0, 100%, 40%);">- /* statistics */</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- } stats;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* local IP address of the RTP socket */</span><br><span> struct in_addr addr;</span><br><span> </span><br><span>diff --git a/include/osmocom/mgcp/mgcp_stat.h b/include/osmocom/mgcp/mgcp_stat.h</span><br><span>index b6c73fa..0bde8cf 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_stat.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_stat.h</span><br><span>@@ -30,8 +30,7 @@</span><br><span> void mgcp_format_stats(char *str, size_t str_len, struct mgcp_conn *conn);</span><br><span> </span><br><span> /* Exposed for test purposes only, do not use actively */</span><br><span style="color: hsl(0, 100%, 40%);">-void calc_loss(struct mgcp_rtp_state *s, struct mgcp_rtp_end *,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t *expected, int *loss);</span><br><span style="color: hsl(120, 100%, 40%);">+void calc_loss(struct mgcp_conn_rtp *conn, uint32_t *expected, int *loss);</span><br><span> </span><br><span> /* Exposed for test purposes only, do not use actively */</span><br><span> uint32_t calc_jitter(struct mgcp_rtp_state *);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index e49559c..3a5db0f 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -31,22 +31,21 @@</span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span> #include <ctype.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(0, 100%, 40%);">- IN_STREAM_ERR_TSTMP_CTR,</span><br><span style="color: hsl(0, 100%, 40%);">- OUT_STREAM_ERR_TSTMP_CTR,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</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>@@ -107,7 +106,6 @@</span><br><span> </span><br><span> end->rtp.fd = -1;</span><br><span> end->rtcp.fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&end->stats, 0, sizeof(end->stats));</span><br><span> end->rtp_port = end->rtcp_port = 0;</span><br><span> talloc_free(end->fmtp_extra);</span><br><span> end->fmtp_extra = NULL;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index b47b76c..494156d 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(&conn_dst->rate_ctr_group->ctr[RTP_DROPPED_PACKETS_CTR]);</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->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&conn_dst->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], len);</span><br><span> </span><br><span> nbytes += len;</span><br><span> buflen = cont;</span><br><span>@@ -769,8 +769,8 @@</span><br><span> &rtp_end->addr,</span><br><span> rtp_end->rtcp_port, buf, 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->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&conn_dst->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], len);</span><br><span> </span><br><span> return len;</span><br><span> }</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->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&conn->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR], 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_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index 281595c..26817c8 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -256,8 +256,8 @@</span><br><span> .sin_port = conn_net->end.rtp_port,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- conn_bts->end.stats.octets_tx += msg->len;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bts->end.stats.packets_tx++;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn_bts->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&conn_bts->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len);</span><br><span> </span><br><span> /* Send RTP data to NET */</span><br><span> /* FIXME: Get rid of conn_bts and conn_net! */</span><br><span>@@ -283,8 +283,8 @@</span><br><span> .sin_port = conn_bts->end.rtp_port,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- conn_net->end.stats.octets_tx += msg->len;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_net->end.stats.packets_tx++;</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn_net->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len); </span><br><span> </span><br><span> /* Send RTP data to BTS */</span><br><span> /* FIXME: Get rid of conn_bts and conn_net! */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c</span><br><span>index cc723bb..4072ac0 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_stat.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_stat.c</span><br><span>@@ -27,10 +27,11 @@</span><br><span> #include <limits.h></span><br><span> </span><br><span> /* Helper function for mgcp_format_stats_rtp() to calculate packet loss */</span><br><span style="color: hsl(0, 100%, 40%);">-void calc_loss(struct mgcp_rtp_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *end, uint32_t *expected,</span><br><span style="color: hsl(0, 100%, 40%);">- int *loss)</span><br><span style="color: hsl(120, 100%, 40%);">+void calc_loss(struct mgcp_conn_rtp *conn, uint32_t *expected, int *loss)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_rtp_state *state = &conn->state;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *packets_rx = &conn->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> *expected = state->stats.cycles + state->stats.max_seq;</span><br><span> *expected = *expected - state->stats.base_seq + 1;</span><br><span> </span><br><span>@@ -44,8 +45,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 - packets_rx->current;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (*expected < packets_rx->current) {</span><br><span> if (*loss > 0)</span><br><span> *loss = INT_MIN;</span><br><span> } else {</span><br><span>@@ -70,13 +71,18 @@</span><br><span> int ploss;</span><br><span> int nchars;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- calc_loss(&conn->state, &conn->end, &expected, &ploss);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *packets_rx = &conn->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *octets_rx = &conn->rate_ctr_group->ctr[RTP_OCTETS_RX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *packets_tx = &conn->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *octets_tx = &conn->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ calc_loss(conn, &expected, &ploss);</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%);">+ packets_tx->current, octets_tx->current,</span><br><span style="color: hsl(120, 100%, 40%);">+ packets_rx->current, 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..b586ff6 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -154,14 +154,18 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dump_rtp_end(struct vty *vty, struct mgcp_rtp_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end *end)</span><br><span style="color: hsl(120, 100%, 40%);">+static void dump_rtp_end(struct vty *vty, struct mgcp_conn_rtp *conn)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_rtp_state *state = &conn->state;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_rtp_end *end = &conn->end;</span><br><span> struct mgcp_rtp_codec *codec = end->codec;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *dropped_packets;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ dropped_packets = &conn->rate_ctr_group->ctr[RTP_DROPPED_PACKETS_CTR];</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 +174,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%);">+ 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>@@ -208,8 +212,7 @@</span><br><span> * connection types (E1) as soon as</span><br><span> * the implementation is available */</span><br><span> if (conn->type == MGCP_CONN_TYPE_RTP) {</span><br><span style="color: hsl(0, 100%, 40%);">- dump_rtp_end(vty, &conn->u.rtp.state,</span><br><span style="color: hsl(0, 100%, 40%);">- &conn->u.rtp.end);</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_rtp_end(vty, &conn->u.rtp);</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 1d2cf4a..56d0cee 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -937,23 +937,43 @@</span><br><span> static void test_packet_loss_calc(void)</span><br><span> {</span><br><span> int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_endpoint endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_trunk_config trunk;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> printf("Testing packet loss calculation.\n");</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&endp, 0, sizeof(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&trunk, 0, sizeof(trunk));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ endp.type = &ep_typeset.rtp;</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk.vty_number_endpoints = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk.endpoints = &endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ endp.tcfg = &trunk;</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&endp.conns);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> for (i = 0; i < ARRAY_SIZE(pl_test_dat); ++i) {</span><br><span> uint32_t expected;</span><br><span> int loss;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_state state;</span><br><span style="color: hsl(0, 100%, 40%);">- struct mgcp_rtp_end rtp;</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&state, 0, sizeof(state));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(&rtp, 0, sizeof(rtp));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- state.stats.initialized = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- state.stats.base_seq = pl_test_dat[i].base_seq;</span><br><span style="color: hsl(0, 100%, 40%);">- state.stats.max_seq = pl_test_dat[i].max_seq;</span><br><span style="color: hsl(0, 100%, 40%);">- state.stats.cycles = pl_test_dat[i].cycles;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_conn_rtp *conn = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_conn *_conn = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_rtp_state *state;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr *packets_rx;</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(0, 100%, 40%);">- calc_loss(&state, &rtp, &expected, &loss);</span><br><span style="color: hsl(120, 100%, 40%);">+ _conn =</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_alloc(NULL, &endp, MGCP_CONN_TYPE_RTP,</span><br><span style="color: hsl(120, 100%, 40%);">+ "test-connection");</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = mgcp_conn_get_rtp(&endp, _conn->id);</span><br><span style="color: hsl(120, 100%, 40%);">+ state = &conn->state;</span><br><span style="color: hsl(120, 100%, 40%);">+ packets_rx = &conn->rate_ctr_group->ctr[RTP_PACKETS_RX_CTR];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ state->stats.initialized = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->stats.base_seq = pl_test_dat[i].base_seq;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->stats.max_seq = pl_test_dat[i].max_seq;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->stats.cycles = pl_test_dat[i].cycles;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ packets_rx->current = pl_test_dat[i].packets;</span><br><span style="color: hsl(120, 100%, 40%);">+ calc_loss(conn, &expected, &loss);</span><br><span> </span><br><span> if (loss != pl_test_dat[i].loss</span><br><span> || expected != pl_test_dat[i].expected) {</span><br><span>@@ -962,7 +982,10 @@</span><br><span> i, loss, pl_test_dat[i].loss, expected,</span><br><span> pl_test_dat[i].expected);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_free_all(&endp);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> int mgcp_parse_stats(struct msgb *msg, uint32_t *ps, uint32_t *os,</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: merged </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: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>