<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11439">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use a dynamic name for rtp connection rate counters<br><br>Before this change, when running 'show rate-counters' on the VTY,<br>rate counters groups for all RTP connections shared the same static<br>name "rtp connection statistics". This made it impossible to discern<br>which connection an RTP counter group applied to.<br><br>Instead, allocate a fresh copy of rate counter descriptions for each<br>RTP connection and use a connection-specific label for the rate counter<br>group which includes the internal connection ID, the endpoint number,<br>and the callid.<br><br>Example of the new rate counter group naming scheme:<br>"rtp statistics for connection 5E7B20AF, endpoint:0x2, callid '1226'"<br><br>With input from Philipp Maier.<br><br>Change-Id: I027644f4b913e1f966c11b081e9027e61591a224<br>Related: OS#2660<br>---<br>M src/libosmo-mgcp/mgcp_conn.c<br>1 file changed, 12 insertions(+), 2 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/39/11439/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index 820c63a..dd3c64c 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> </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 style="color: hsl(0, 100%, 40%);">-      .group_description = "rtp connection statistics",</span><br><span style="color: hsl(120, 100%, 40%);">+   .group_description = "rtp statistics",</span><br><span>     .class_id = 1,</span><br><span>       .num_ctr = ARRAY_SIZE(rate_ctr_desc),</span><br><span>        .ctr_desc = rate_ctr_desc</span><br><span>@@ -94,6 +94,8 @@</span><br><span> static void mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn)</span><br><span> {</span><br><span>         struct mgcp_rtp_end *end = &conn_rtp->end;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct rate_ctr_group_desc *rate_ctrs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     /* FIXME: Each new rate counter group requires an unique index. At the</span><br><span>        * moment we generate this index using this counter, but perhaps there</span><br><span>        * is a more concious way to assign the indexes. */</span><br><span>@@ -117,7 +119,15 @@</span><br><span>   end->output_enabled = 0;</span><br><span>  end->maximum_packet_time = -1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+   rate_ctrs = talloc(conn, struct rate_ctr_group_desc);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rate_ctrs);</span><br><span style="color: hsl(120, 100%, 40%);">+       memcpy(rate_ctrs, &rate_ctr_group_desc, sizeof(*rate_ctrs));</span><br><span style="color: hsl(120, 100%, 40%);">+      rate_ctrs->group_description = talloc_asprintf(conn, "%s for connection %s, endpoint:0x%x, callid '%s'",</span><br><span style="color: hsl(120, 100%, 40%);">+                                                rate_ctr_group_desc.group_description, conn->id,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   ENDPOINT_NUMBER(conn->endp), conn->endp->callid);</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(rate_ctrs->group_description);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, rate_ctrs, rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+  OSMO_ASSERT(conn_rtp->rate_ctr_group);</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>       rate_ctr_index++;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11439">change 11439</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/11439"/><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: I027644f4b913e1f966c11b081e9027e61591a224 </div>
<div style="display:none"> Gerrit-Change-Number: 11439 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>