<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9943">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: Use incrementing id for rate_ctr_group_alloc<br><br>Wrap-around of var handling next id will luckly happen<br>long after initially assigned TBFs are already released.<br><br>Change-Id: I90ef64133986c556c1a529f5b966e847e6cabbad<br>---<br>M src/tbf.cpp<br>1 file changed, 18 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/9943/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 71057db..6792d08 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -51,6 +51,8 @@</span><br><span> </span><br><span> extern void *tall_pcu_ctx;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void tbf_timer_cb(void *_tbf);</span><br><span> </span><br><span> const struct value_string gprs_rlcmac_tbf_poll_state_names[] = {</span><br><span>@@ -922,7 +924,7 @@</span><br><span>             "Allocated: trx = %d, ul_slots = %02x, dl_slots = %02x\n",</span><br><span>                 tbf->trx->trx_no, tbf->ul_slots(), tbf->dl_slots());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    tbf->m_ctrs = rate_ctr_group_alloc(tbf, &tbf_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+    tbf->m_ctrs = rate_ctr_group_alloc(tbf, &tbf_ctrg_desc, next_tbf_ctr_group_id++);</span><br><span>     if (!tbf->m_ctrs) {</span><br><span>               LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF counters\n");</span><br><span>          return -1;</span><br><span>@@ -1005,8 +1007,10 @@</span><br><span>          return NULL;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf, &tbf_ul_egprs_ctrg_desc, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-    tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf, &tbf_ul_gprs_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+    tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   &tbf_ul_egprs_ctrg_desc, tbf->m_ctrs->idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+                                    &tbf_ul_gprs_ctrg_desc, tbf->m_ctrs->idx);</span><br><span>         if (!tbf->m_ul_egprs_ctrs || !tbf->m_ul_gprs_ctrs) {</span><br><span>           LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate TBF UL counters\n");</span><br><span>               talloc_free(tbf);</span><br><span>@@ -1094,14 +1098,18 @@</span><br><span> </span><br><span>      if (tbf->is_egprs_enabled()) {</span><br><span>            tbf->set_window_size();</span><br><span style="color: hsl(0, 100%, 40%);">-              tbf->m_dl_egprs_ctrs = rate_ctr_group_alloc(tbf, &tbf_dl_egprs_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+          tbf->m_dl_egprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   &tbf_dl_egprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                  tbf->m_ctrs->idx);</span><br><span>             if (!tbf->m_dl_egprs_ctrs) {</span><br><span>                      LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate EGPRS DL counters\n");</span><br><span>                     talloc_free(tbf);</span><br><span>                    return NULL;</span><br><span>                 }</span><br><span>    } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                tbf->m_dl_gprs_ctrs = rate_ctr_group_alloc(tbf, &tbf_dl_gprs_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+            tbf->m_dl_gprs_ctrs = rate_ctr_group_alloc(tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                    &tbf_dl_gprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   tbf->m_ctrs->idx);</span><br><span>             if (!tbf->m_dl_gprs_ctrs) {</span><br><span>                       LOGPTBF(tbf, LOGL_ERROR, "Couldn't allocate GPRS DL counters\n");</span><br><span>                      talloc_free(tbf);</span><br><span>@@ -1569,11 +1577,13 @@</span><br><span>  TBF_SET_ASS_STATE_UL(ul_tbf, GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ);</span><br><span>       ul_tbf->control_ts = ts;</span><br><span>  ul_tbf->trx = trx;</span><br><span style="color: hsl(0, 100%, 40%);">-   ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+      ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ctrg_desc, next_tbf_ctr_group_id++);</span><br><span>       ul_tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(ul_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">-                                       &tbf_ul_egprs_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+                                                     &tbf_ul_egprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                  ul_tbf->m_ctrs->idx);</span><br><span>   ul_tbf->m_ul_gprs_ctrs = rate_ctr_group_alloc(ul_tbf,</span><br><span style="color: hsl(0, 100%, 40%);">-                                        &tbf_ul_gprs_ctrg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+                                                     &tbf_ul_gprs_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                   ul_tbf->m_ctrs->idx);</span><br><span>    if (!ul_tbf->m_ctrs || !ul_tbf->m_ul_egprs_ctrs || !ul_tbf->m_ul_gprs_ctrs) {</span><br><span>               LOGPTBF(ul_tbf, LOGL_ERROR, "Cound not allocate TBF UL rate counters\n");</span><br><span>          talloc_free(ul_tbf);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9943">change 9943</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/9943"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I90ef64133986c556c1a529f5b966e847e6cabbad </div>
<div style="display:none"> Gerrit-Change-Number: 9943 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>