<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/24547">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use new stat item/ctr getter APIs<br><br>Change-Id: I1fdfdae2810c3c82ff62fe725ffa364df4ebeff5<br>---<br>M CommonLibs/trx_rate_ctr.cpp<br>M TODO-RELEASE<br>2 files changed, 16 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/47/24547/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp</span><br><span>index e902ff1..ba4fcc0 100644</span><br><span>--- a/CommonLibs/trx_rate_ctr.cpp</span><br><span>+++ b/CommonLibs/trx_rate_ctr.cpp</span><br><span>@@ -147,17 +147,17 @@</span><br><span>                 if (dev_ctrs_pending[chan].chan == PENDING_CHAN_NONE)</span><br><span>                        continue;</span><br><span>            LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update";</span><br><span style="color: hsl(0, 100%, 40%);">-                ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_OVERRUNS];</span><br><span style="color: hsl(120, 100%, 40%);">+          ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_DEV_RX_OVERRUNS);</span><br><span>              rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_overruns - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-                ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_UNDERRUNS];</span><br><span style="color: hsl(120, 100%, 40%);">+         ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_DEV_TX_UNDERRUNS);</span><br><span>             rate_ctr_add(ctr, dev_ctrs_pending[chan].tx_underruns - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-               ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_DROP_EV];</span><br><span style="color: hsl(120, 100%, 40%);">+           ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_DEV_RX_DROP_EV);</span><br><span>               rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_dropped_events - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-          ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_RX_DROP_SMPL];</span><br><span style="color: hsl(120, 100%, 40%);">+         ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_DEV_RX_DROP_SMPL);</span><br><span>             rate_ctr_add(ctr, dev_ctrs_pending[chan].rx_dropped_samples - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-         ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_DROP_EV];</span><br><span style="color: hsl(120, 100%, 40%);">+           ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_DEV_TX_DROP_EV);</span><br><span>               rate_ctr_add(ctr, dev_ctrs_pending[chan].tx_dropped_events - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-          ctr = &rate_ctrs[chan]->ctr[TRX_CTR_DEV_TX_DROP_SMPL];</span><br><span style="color: hsl(120, 100%, 40%);">+         ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_DEV_TX_DROP_SMPL);</span><br><span>             rate_ctr_add(ctr, dev_ctrs_pending[chan].tx_dropped_samples - ctr->current);</span><br><span> </span><br><span>          /* Mark as done */</span><br><span>@@ -178,21 +178,21 @@</span><br><span>           if (trx_ctrs_pending[chan].chan == PENDING_CHAN_NONE)</span><br><span>                        continue;</span><br><span>            LOGCHAN(chan, DCTR, DEBUG) << "rate_ctr update";</span><br><span style="color: hsl(0, 100%, 40%);">-                ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_STALE_BURSTS];</span><br><span style="color: hsl(120, 100%, 40%);">+              ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_TX_STALE_BURSTS);</span><br><span>          rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_stale_bursts - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-            ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS];</span><br><span style="color: hsl(120, 100%, 40%);">+                ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_TX_UNAVAILABLE_BURSTS);</span><br><span>            rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_unavailable_bursts - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-              ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_REPEATED];</span><br><span style="color: hsl(120, 100%, 40%);">+             ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_TRXD_FN_REPEATED);</span><br><span>                 rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_repeated - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-                ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_OUTOFORDER];</span><br><span style="color: hsl(120, 100%, 40%);">+           ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_TRXD_FN_OUTOFORDER);</span><br><span>               rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_outoforder - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-              ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_TRXD_FN_SKIPPED];</span><br><span style="color: hsl(120, 100%, 40%);">+              ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_TRXD_FN_SKIPPED);</span><br><span>          rate_ctr_add(ctr, trx_ctrs_pending[chan].tx_trxd_fn_skipped - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-         ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_EMPTY_BURST];</span><br><span style="color: hsl(120, 100%, 40%);">+               ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_RX_EMPTY_BURST);</span><br><span>           rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_empty_burst - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-             ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_CLIPPING];</span><br><span style="color: hsl(120, 100%, 40%);">+          ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_RX_CLIPPING);</span><br><span>              rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_clipping - ctr->current);</span><br><span style="color: hsl(0, 100%, 40%);">-                ctr = &rate_ctrs[chan]->ctr[TRX_CTR_TRX_RX_NO_BURST_DETECTED];</span><br><span style="color: hsl(120, 100%, 40%);">+         ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], TRX_CTR_TRX_RX_NO_BURST_DETECTED);</span><br><span>             rate_ctr_add(ctr, trx_ctrs_pending[chan].rx_no_burst_detected - ctr->current);</span><br><span>            /* Mark as done */</span><br><span>           trx_ctrs_pending[chan].chan = PENDING_CHAN_NONE;</span><br><span>@@ -263,7 +263,7 @@</span><br><span> </span><br><span>   llist_for_each_entry(ctr_thr, &threshold_list, list) {</span><br><span>           for (chan = 0; chan < chan_len; chan++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                    rate_ctr = &rate_ctrs[chan]->ctr[ctr_thr->ctr_id];</span><br><span style="color: hsl(120, 100%, 40%);">+                  rate_ctr = rate_ctr_group_get_ctr(rate_ctrs[chan], ctr_thr->ctr_id);</span><br><span>                      LOGCHAN(chan, DCTR, INFO) << "checking threshold: " << ctr_threshold_2_vty_str(ctr_thr)</span><br><span>                                                   << " ("<< rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")";</span><br><span>                       if (rate_ctr->intv[ctr_thr->intv].rate >= ctr_thr->val) {</span><br><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index e69de29..ab54c42 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+libosmocore > 1.5.1  require APIs osmo_stat_item_group_get_item, rate_ctr_group_get_ctr</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/24547">change 24547</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-trx/+/24547"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1fdfdae2810c3c82ff62fe725ffa364df4ebeff5 </div>
<div style="display:none"> Gerrit-Change-Number: 24547 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>