<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25422">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libosmo-mgcp: atomic rate counter group indexes<br><br>Postfix++ on atomics is specified as rmw operation with<br>memory_order_seq_cst.<br><br>Change-Id: Ib82d15aab2b3ba25827f9cf8751dbf87ee92a444<br>---<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_ratectr.c<br>2 files changed, 15 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/22/25422/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 7988c48..ca12347 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -21,6 +21,7 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdatomic.h></span><br><span> #include <osmocom/mgcp/mgcp_conn.h></span><br><span> #include <osmocom/mgcp/mgcp_network.h></span><br><span> #include <osmocom/mgcp/mgcp_protocol.h></span><br><span>@@ -89,7 +90,7 @@</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 style="color: hsl(0, 100%, 40%);">- static unsigned int rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static atomic_uint rate_ctr_index = 0;</span><br><span> </span><br><span> conn_rtp->type = MGCP_RTP_DEFAULT;</span><br><span> conn_rtp->osmux.cid_allocated = false;</span><br><span>@@ -110,13 +111,12 @@</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%);">+ conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index++);</span><br><span> if (!conn_rtp->rate_ctr_group)</span><br><span> return -1;</span><br><span> </span><br><span> conn_rtp->state.in_stream.err_ts_ctr = rate_ctr_group_get_ctr(conn_rtp->rate_ctr_group, IN_STREAM_ERR_TSTMP_CTR);</span><br><span> conn_rtp->state.out_stream.err_ts_ctr = rate_ctr_group_get_ctr(conn_rtp->rate_ctr_group, OUT_STREAM_ERR_TSTMP_CTR);</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_index++;</span><br><span> </span><br><span> /* Make sure codec table is reset */</span><br><span> mgcp_codec_reset_all(conn_rtp);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_ratectr.c b/src/libosmo-mgcp/mgcp_ratectr.c</span><br><span>index 040dbb5..6030ce2 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_ratectr.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_ratectr.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> *</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdatomic.h></span><br><span> #include <errno.h></span><br><span> #include <osmocom/core/stats.h></span><br><span> #include <osmocom/core/stat_item.h></span><br><span>@@ -152,17 +153,16 @@</span><br><span> int mgcp_ratectr_global_alloc(struct mgcp_config *cfg)</span><br><span> {</span><br><span> struct mgcp_ratectr_global *ratectr = &cfg->ratectr;</span><br><span style="color: hsl(0, 100%, 40%);">- static unsigned int general_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static atomic_uint general_rate_ctr_index = 0;</span><br><span> char ctr_name[512];</span><br><span> </span><br><span> if (ratectr->mgcp_general_ctr_group == NULL) {</span><br><span> ratectr->mgcp_general_ctr_group =</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_group_alloc(cfg, &mgcp_general_ctr_group_desc, general_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_alloc(cfg, &mgcp_general_ctr_group_desc, general_rate_ctr_index++);</span><br><span> if (!ratectr->mgcp_general_ctr_group)</span><br><span> return -EINVAL;</span><br><span> snprintf(ctr_name, sizeof(ctr_name), "%s:general", cfg->domain);</span><br><span> rate_ctr_group_set_name(ratectr->mgcp_general_ctr_group, ctr_name);</span><br><span style="color: hsl(0, 100%, 40%);">- general_rate_ctr_index++;</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -187,62 +187,57 @@</span><br><span> int mgcp_ratectr_trunk_alloc(struct mgcp_trunk *trunk)</span><br><span> {</span><br><span> struct mgcp_ratectr_trunk *ratectr = &trunk->ratectr;</span><br><span style="color: hsl(0, 100%, 40%);">- static unsigned int crcx_rate_ctr_index = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- static unsigned int mdcx_rate_ctr_index = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- static unsigned int dlcx_rate_ctr_index = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- static unsigned int all_rtp_conn_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static atomic_uint crcx_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static atomic_uint mdcx_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static atomic_uint dlcx_rate_ctr_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ static atomic_uint all_rtp_conn_rate_ctr_index = 0;</span><br><span> char ctr_name[256];</span><br><span> </span><br><span> if (ratectr->mgcp_crcx_ctr_group == NULL) {</span><br><span> ratectr->mgcp_crcx_ctr_group =</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_group_alloc(trunk, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_alloc(trunk, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index++);</span><br><span> if (!ratectr->mgcp_crcx_ctr_group)</span><br><span> return -EINVAL;</span><br><span> snprintf(ctr_name, sizeof(ctr_name), "%s-%u:crcx", mgcp_trunk_type_strs_str(trunk->trunk_type),</span><br><span> trunk->trunk_nr);</span><br><span> rate_ctr_group_set_name(ratectr->mgcp_crcx_ctr_group, ctr_name);</span><br><span style="color: hsl(0, 100%, 40%);">- crcx_rate_ctr_index++;</span><br><span> }</span><br><span> if (ratectr->mgcp_mdcx_ctr_group == NULL) {</span><br><span> ratectr->mgcp_mdcx_ctr_group =</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_group_alloc(trunk, &mgcp_mdcx_ctr_group_desc, mdcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_alloc(trunk, &mgcp_mdcx_ctr_group_desc, mdcx_rate_ctr_index++);</span><br><span> if (!ratectr->mgcp_mdcx_ctr_group)</span><br><span> return -EINVAL;</span><br><span> snprintf(ctr_name, sizeof(ctr_name), "%s-%u:mdcx", mgcp_trunk_type_strs_str(trunk->trunk_type),</span><br><span> trunk->trunk_nr);</span><br><span> rate_ctr_group_set_name(ratectr->mgcp_mdcx_ctr_group, ctr_name);</span><br><span style="color: hsl(0, 100%, 40%);">- mdcx_rate_ctr_index++;</span><br><span> }</span><br><span> if (ratectr->mgcp_dlcx_ctr_group == NULL) {</span><br><span> ratectr->mgcp_dlcx_ctr_group =</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_group_alloc(trunk, &mgcp_dlcx_ctr_group_desc, dlcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_alloc(trunk, &mgcp_dlcx_ctr_group_desc, dlcx_rate_ctr_index++);</span><br><span> if (!ratectr->mgcp_dlcx_ctr_group)</span><br><span> return -EINVAL;</span><br><span> snprintf(ctr_name, sizeof(ctr_name), "%s-%u:dlcx", mgcp_trunk_type_strs_str(trunk->trunk_type),</span><br><span> trunk->trunk_nr);</span><br><span> rate_ctr_group_set_name(ratectr->mgcp_dlcx_ctr_group, ctr_name);</span><br><span style="color: hsl(0, 100%, 40%);">- dlcx_rate_ctr_index++;</span><br><span> }</span><br><span> if (ratectr->all_rtp_conn_stats == NULL) {</span><br><span> ratectr->all_rtp_conn_stats = rate_ctr_group_alloc(trunk, &all_rtp_conn_rate_ctr_group_desc,</span><br><span style="color: hsl(0, 100%, 40%);">- all_rtp_conn_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ all_rtp_conn_rate_ctr_index++);</span><br><span> if (!ratectr->all_rtp_conn_stats)</span><br><span> return -EINVAL;</span><br><span> snprintf(ctr_name, sizeof(ctr_name), "%s-%u:rtp_conn", mgcp_trunk_type_strs_str(trunk->trunk_type),</span><br><span> trunk->trunk_nr);</span><br><span> rate_ctr_group_set_name(ratectr->all_rtp_conn_stats, ctr_name);</span><br><span style="color: hsl(0, 100%, 40%);">- all_rtp_conn_rate_ctr_index++;</span><br><span> }</span><br><span> </span><br><span> /* E1 specific */</span><br><span> if (trunk->trunk_type == MGCP_TRUNK_E1 && ratectr->e1_stats == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- ratectr->e1_stats = rate_ctr_group_alloc(trunk, &e1_rate_ctr_group_desc, mdcx_rate_ctr_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ ratectr->e1_stats = rate_ctr_group_alloc(trunk, &e1_rate_ctr_group_desc, mdcx_rate_ctr_index++);</span><br><span> if (!ratectr->e1_stats)</span><br><span> return -EINVAL;</span><br><span> snprintf(ctr_name, sizeof(ctr_name), "%s-%u:e1", mgcp_trunk_type_strs_str(trunk->trunk_type),</span><br><span> trunk->trunk_nr);</span><br><span> rate_ctr_group_set_name(ratectr->e1_stats, ctr_name);</span><br><span style="color: hsl(0, 100%, 40%);">- mdcx_rate_ctr_index++;</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25422">change 25422</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/c/osmo-mgw/+/25422"/><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-Change-Id: Ib82d15aab2b3ba25827f9cf8751dbf87ee92a444 </div>
<div style="display:none"> Gerrit-Change-Number: 25422 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>