<p>Stefan Sperling <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11519">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Pau Espin Pedrol: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add aggregated rtp connection stats to osmo-mgw<br><br>Add a counter group for aggregated RTP connection statistics.<br>This group contains RTP counters which aggregate values of the<br>ephemeral RTP counters maintained per connection (mgcp_conn).<br><br>This provides a global overview of RTP processing for each<br>trunk throughout the lifetime of the osmo-mgw process.<br><br>The counters are displayed by 'show mgcp stats' and 'show rate-counters'.<br><br>While here, fix a typo in an item of the mgcp_conn_rate_ctr_desc array:<br>"rtp:octets_rx" was displayed for outbound packes; now says "_tx".<br><br>Change-Id: I80d36181600901ae2e0f321dc02b5d54ddc94139<br>Related: OS#2660<br>---<br>M include/osmocom/mgcp/mgcp.h<br>M include/osmocom/mgcp/mgcp_conn.h<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>5 files changed, 80 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h</span><br><span>index c8c2cfd..aa5607f 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -194,9 +194,12 @@</span><br><span> int vty_number_endpoints;</span><br><span> struct mgcp_endpoint *endpoints;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rate counter group which contains stats for processed CRCX commands. */</span><br><span> struct rate_ctr_group *mgcp_crcx_ctr_group;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rate counter group which contains stats for processed MDCX commands. */</span><br><span> struct rate_ctr_group *mgcp_mdcx_ctr_group;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rate counter group which aggregates stats of individual RTP connections. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *all_rtp_conn_stats;</span><br><span> };</span><br><span> </span><br><span> enum mgcp_role {</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h</span><br><span>index 3da7334..b0978a6 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_conn.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_conn.h</span><br><span>@@ -25,6 +25,7 @@</span><br><span> </span><br><span> #include <osmocom/mgcp/mgcp_internal.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/rate_ctr.h></span><br><span> #include <inttypes.h></span><br><span> </span><br><span> /* RTP connection related counters */</span><br><span>@@ -35,7 +36,36 @@</span><br><span> RTP_OCTETS_RX_CTR,</span><br><span> RTP_PACKETS_TX_CTR,</span><br><span> RTP_OCTETS_TX_CTR,</span><br><span style="color: hsl(0, 100%, 40%);">- RTP_DROPPED_PACKETS_CTR</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_DROPPED_PACKETS_CTR,</span><br><span style="color: hsl(120, 100%, 40%);">+ RTP_NUM_CONNECTIONS,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* RTP per-connection statistics. Instances of the corresponding rate counter group</span><br><span style="color: hsl(120, 100%, 40%);">+ * exist for the lifetime of an RTP connection.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Must be kept in sync with all_rtp_conn_rate_ctr_desc below */</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc mgcp_conn_rate_ctr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [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_tx", "Outbound rtp octets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_DROPPED_PACKETS_CTR] = {"rtp:dropped", "dropped rtp packets."}</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Aggregated RTP connection stats. These are updated when an RTP connection is freed.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Must be kept in sync with mgcp_conn_rate_ctr_desc above */</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [IN_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_in", "Total inbound rtp-stream timestamp errors."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [OUT_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_out", "Total outbound rtp-stream timestamp errors."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_PACKETS_RX_CTR] = {"all_rtp:packets_rx", "Total inbound rtp packets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_OCTETS_RX_CTR] = {"all_rtp:octets_rx", "Total inbound rtp octets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_PACKETS_TX_CTR] = {"all_rtp:packets_tx", "Total outbound rtp packets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_OCTETS_TX_CTR] = {"all_rtp:octets_tx", "Total outbound rtp octets."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_DROPPED_PACKETS_CTR] = {"all_rtp:dropped", "Total dropped rtp packets."},</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This last counter does not exist in per-connection stats, only here. */</span><br><span style="color: hsl(120, 100%, 40%);">+ [RTP_NUM_CONNECTIONS] = {"all_rtp:num_closed_conns", "Total number of rtp connections closed."}</span><br><span> };</span><br><span> </span><br><span> struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp,</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index 820c63a..fce8a78 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,12 @@</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%);">-static const struct rate_ctr_desc rate_ctr_desc[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."},</span><br><span style="color: hsl(0, 100%, 40%);">- [OUT_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:out", "Outbound rtp-stream timestamp errors."},</span><br><span style="color: hsl(0, 100%, 40%);">- [RTP_PACKETS_RX_CTR] = {"rtp:packets_rx", "Inbound rtp packets."},</span><br><span style="color: hsl(0, 100%, 40%);">- [RTP_OCTETS_RX_CTR] = {"rtp:octets_rx", "Inbound rtp octets."},</span><br><span style="color: hsl(0, 100%, 40%);">- [RTP_PACKETS_TX_CTR] = {"rtp:packets_tx", "Outbound rtp packets."},</span><br><span style="color: hsl(0, 100%, 40%);">- [RTP_OCTETS_TX_CTR] = {"rtp:octets_rx", "Outbound rtp octets."},</span><br><span style="color: hsl(0, 100%, 40%);">- [RTP_DROPPED_PACKETS_CTR] = {"rtp:dropped", "dropped rtp packets."}</span><br><span style="color: hsl(0, 100%, 40%);">-};</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 = ARRAY_SIZE(rate_ctr_desc),</span><br><span style="color: hsl(0, 100%, 40%);">- .ctr_desc = rate_ctr_desc</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_ctr = ARRAY_SIZE(mgcp_conn_rate_ctr_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ .ctr_desc = mgcp_conn_rate_ctr_desc</span><br><span> };</span><br><span> </span><br><span> </span><br><span>@@ -234,6 +224,27 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void</span><br><span style="color: hsl(120, 100%, 40%);">+aggregate_rtp_conn_stats(struct mgcp_trunk_config *trunk, struct mgcp_conn_rtp *conn_rtp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *all_stats = trunk->all_rtp_conn_stats;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *conn_stats = conn_rtp->rate_ctr_group;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (all_stats == NULL || conn_stats == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Compared to per-connection RTP statistics, aggregated RTP statistics</span><br><span style="color: hsl(120, 100%, 40%);">+ * contain one additional rate couter item (RTP_NUM_CONNECTIONS).</span><br><span style="color: hsl(120, 100%, 40%);">+ * All other counters in both counter groups correspond to each other. */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn_stats->desc->num_ctr + 1 == all_stats->desc->num_ctr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < conn_stats->desc->num_ctr; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&all_stats->ctr[i], conn_stats->ctr[i].current);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&all_stats->ctr[RTP_NUM_CONNECTIONS]);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! free a connection by its ID.</span><br><span> * \param[in] endp associated endpoint</span><br><span> * \param[in] id identification number of the connection */</span><br><span>@@ -253,6 +264,7 @@</span><br><span> </span><br><span> switch (conn->type) {</span><br><span> case MGCP_CONN_TYPE_RTP:</span><br><span style="color: hsl(120, 100%, 40%);">+ aggregate_rtp_conn_stats(endp->tcfg, &conn->u.rtp);</span><br><span> mgcp_rtp_conn_cleanup(&conn->u.rtp);</span><br><span> break;</span><br><span> default:</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 3a0e4ea..90c282c 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -42,6 +42,7 @@</span><br><span> #include <osmocom/mgcp/mgcp_endp.h></span><br><span> #include <osmocom/mgcp/mgcp_sdp.h></span><br><span> #include <osmocom/mgcp/mgcp_codec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_conn.h></span><br><span> </span><br><span> struct mgcp_request {</span><br><span> char *name;</span><br><span>@@ -103,6 +104,14 @@</span><br><span> .ctr_desc = mgcp_mdcx_ctr_desc</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const static struct rate_ctr_group_desc all_rtp_conn_rate_ctr_group_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_name_prefix = "all_rtp_conn",</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_description = "aggregated statistics for all rtp connections",</span><br><span style="color: hsl(120, 100%, 40%);">+ .class_id = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_ctr = ARRAY_SIZE(all_rtp_conn_rate_ctr_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ .ctr_desc = all_rtp_conn_rate_ctr_desc</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *data);</span><br><span> static struct msgb *handle_create_con(struct mgcp_parse_data *data);</span><br><span> static struct msgb *handle_delete_con(struct mgcp_parse_data *data);</span><br><span>@@ -1494,6 +1503,7 @@</span><br><span> * a better way of assigning indices? */</span><br><span> static unsigned int crcx_rate_ctr_index = 0;</span><br><span> static unsigned int mdcx_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static unsigned int all_rtp_conn_rate_ctr_index = 0;</span><br><span> </span><br><span> if (trunk->mgcp_crcx_ctr_group == NULL) {</span><br><span> trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index);</span><br><span>@@ -1507,6 +1517,13 @@</span><br><span> talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group);</span><br><span> mdcx_rate_ctr_index++;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trunk->all_rtp_conn_stats == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ all_rtp_conn_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(trunk->all_rtp_conn_stats);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_set_destructor(trunk->all_rtp_conn_stats, free_rate_counter_group);</span><br><span style="color: hsl(120, 100%, 40%);">+ all_rtp_conn_rate_ctr_index++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /*! allocate configuration with default values.</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index ed8aca5..e40d412 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -253,6 +253,10 @@</span><br><span> vty_out(vty, " %s:%s", cfg->mgcp_mdcx_ctr_group->desc->group_description, VTY_NEWLINE);</span><br><span> vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->mgcp_mdcx_ctr_group);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (show_stats && cfg->all_rtp_conn_stats) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s:%s", cfg->all_rtp_conn_stats->desc->group_description, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out_rate_ctr_group_fmt(vty, " %25n: %10c (%S/s %M/m %H/h %D/d) %d", cfg->all_rtp_conn_stats);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> #define SHOW_MGCP_STR "Display information about the MGCP Media Gateway\n"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11519">change 11519</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/11519"/><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: I80d36181600901ae2e0f321dc02b5d54ddc94139 </div>
<div style="display:none"> Gerrit-Change-Number: 11519 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>