<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25270">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: add rate counter for Uplink block decoding errors<br><br>During the channel activation, allocate a counter group for each<br>logical channel (struct l1sched_chan_state). Deallocate it on<br>deactivation. The rate counter API requires a unique group index,<br>which unfortunately cannot be determined for dedicated channels.<br>As a quick hack, use monolitically increasing numbers for that.<br><br>Change-Id: I7aea0529771ad73d5d6bcaf0865f9b0d4ecace6b<br>Related: OS#4771<br>---<br>M include/osmo-bts/scheduler.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/sched_lchan_pdtch.c<br>M src/osmo-bts-trx/sched_lchan_tchf.c<br>M src/osmo-bts-trx/sched_lchan_tchh.c<br>M src/osmo-bts-trx/sched_lchan_xcch.c<br>6 files changed, 42 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/70/25270/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h</span><br><span>index 80a260f..b526db0 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -148,6 +148,14 @@</span><br><span> </span><br><span> /* handover */</span><br><span> bool ho_rach_detect; /* if rach detection is on */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Rate counters (see L1SCHED_LCHAN_CTR_*) */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *ctrs;</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%);">+/* Rate counters for struct l1sched_chan_state */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ L1SCHED_LCHAN_CTR_UL_BAD_BLOCK,</span><br><span> };</span><br><span> </span><br><span> struct l1sched_ts {</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 6e1e4fb..81cebf4 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -597,6 +597,20 @@</span><br><span> l1sched_ts_ctr_desc</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc l1sched_lchan_ctr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [L1SCHED_LCHAN_CTR_UL_BAD_BLOCK] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "l1sched_lchan:ul_bad_block",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Uplink blocks which could not be decoded (Viterbi errors)"</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%);">+static const struct rate_ctr_group_desc l1sched_lchan_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "l1sched_lchan",</span><br><span style="color: hsl(120, 100%, 40%);">+ "L1 scheduler logical channel",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ ARRAY_SIZE(l1sched_lchan_ctr_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ l1sched_lchan_ctr_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span> * init / exit</span><br><span> */</span><br><span>@@ -677,6 +691,7 @@</span><br><span> talloc_free(chan_state->ul_bursts);</span><br><span> chan_state->ul_bursts = NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_free(chan_state->ctrs);</span><br><span> }</span><br><span> /* clear lchan channel states */</span><br><span> for (i = 0; i < ARRAY_SIZE(ts->lchan); i++)</span><br><span>@@ -1065,6 +1080,8 @@</span><br><span> struct l1sched_ts *l1ts = lchan->ts->priv;</span><br><span> uint8_t tn = L1SAP_CHAN2TS(chan_nr);</span><br><span> uint8_t ss = l1sap_chan2ss(chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ static unsigned int ctrg_idx = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ char ctrg_name[256];</span><br><span> bool found = false;</span><br><span> int i;</span><br><span> </span><br><span>@@ -1104,11 +1121,22 @@</span><br><span> </span><br><span> /* Bind to generic 'struct gsm_lchan' */</span><br><span> chan_state->lchan = lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate per-l1cs rate counters with unique index */</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->ctrs = rate_ctr_group_alloc(l1ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ &l1sched_lchan_ctrg_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrg_idx++);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(ctrg_name, sizeof(ctrg_name), "%s %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->name, trx_chan_desc[i].name);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_set_name(chan_state->ctrs, ctrg_name);</span><br><span> } else {</span><br><span> chan_state->ho_rach_detect = 0;</span><br><span> </span><br><span> /* Remove pending Tx prims belonging to this lchan */</span><br><span> trx_sched_queue_filter(&l1ts->dl_prims, chan_nr, link_id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* De-allocate per-l1cs rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_free(chan_state->ctrs);</span><br><span> }</span><br><span> </span><br><span> chan_state->active = active;</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>index 335ba6f..4bfccf3 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_pdtch.c</span><br><span>@@ -130,6 +130,7 @@</span><br><span> } else {</span><br><span> LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi, "Received bad PDTCH (%u/%u)\n",</span><br><span> bi->fn % l1ts->mf_period, l1ts->mf_period);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(chan_state->ctrs, L1SCHED_LCHAN_CTR_UL_BAD_BLOCK);</span><br><span> rc = 0;</span><br><span> presence_info = PRES_INFO_INVALID;</span><br><span> }</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>index 689925f..ead68b7 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>@@ -212,11 +212,13 @@</span><br><span> if (rc < 0) {</span><br><span> LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, "Received bad data (%u/%u)\n",</span><br><span> bi->fn % l1ts->mf_period, l1ts->mf_period);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(chan_state->ctrs, L1SCHED_LCHAN_CTR_UL_BAD_BLOCK);</span><br><span> bfi_flag = true;</span><br><span> } else if (rc < 4) {</span><br><span> LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi,</span><br><span> "Received bad data (%u/%u) with invalid codec mode %d\n",</span><br><span> bi->fn % l1ts->mf_period, l1ts->mf_period, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(chan_state->ctrs, L1SCHED_LCHAN_CTR_UL_BAD_BLOCK);</span><br><span> bfi_flag = true;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>index 4f03bd1..aec38c3 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>@@ -240,11 +240,13 @@</span><br><span> if (rc < 0) {</span><br><span> LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, "Received bad data (%u/%u)\n",</span><br><span> bi->fn % l1ts->mf_period, l1ts->mf_period);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(chan_state->ctrs, L1SCHED_LCHAN_CTR_UL_BAD_BLOCK);</span><br><span> bfi_flag = true;</span><br><span> } else if (rc < 4) {</span><br><span> LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi,</span><br><span> "Received bad data (%u/%u) with invalid codec mode %d\n",</span><br><span> bi->fn % l1ts->mf_period, l1ts->mf_period, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(chan_state->ctrs, L1SCHED_LCHAN_CTR_UL_BAD_BLOCK);</span><br><span> bfi_flag = true;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>index 4bfc101..f994c1d 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_xcch.c</span><br><span>@@ -131,6 +131,7 @@</span><br><span> if (rc) {</span><br><span> LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi, "Received bad data (%u/%u)\n",</span><br><span> bi->fn % l1ts->mf_period, l1ts->mf_period);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(chan_state->ctrs, L1SCHED_LCHAN_CTR_UL_BAD_BLOCK);</span><br><span> l2_len = 0;</span><br><span> </span><br><span> /* When SACCH Repetition is active, we may try to decode the</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25270">change 25270</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-bts/+/25270"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7aea0529771ad73d5d6bcaf0865f9b0d4ecace6b </div>
<div style="display:none"> Gerrit-Change-Number: 25270 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>