<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18862">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: Add rate_ctr informing about too low rts-advance<br><br>Change-Id: I76c3dd4020c6d74192b03b1d42413ae536da5f05<br>---<br>M include/osmo-bts/scheduler.h<br>M src/common/scheduler.c<br>2 files changed, 25 insertions(+), 0 deletions(-)<br><br></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 f5f346e..e65665f 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -2,6 +2,7 @@</span><br><span> #define TRX_SCHEDULER_H</span><br><span> </span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/rate_ctr.h></span><br><span> </span><br><span> #include <osmo-bts/gsm_data.h></span><br><span> </span><br><span>@@ -142,6 +143,8 @@</span><br><span> </span><br><span> struct llist_head dl_prims; /* Queue primitives for TX */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *ctrs; /* rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Channel states for all logical channels */</span><br><span> struct l1sched_chan_state chan_state[_TRX_CHAN_MAX];</span><br><span> };</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index c1bd19f..b539733 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -30,6 +30,8 @@</span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/bits.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/stats.h></span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_08_58.h></span><br><span> #include <osmocom/gsm/a5.h></span><br><span>@@ -562,6 +564,21 @@</span><br><span> },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ L1SCHED_TS_CTR_DL_LATE,</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_desc l1sched_ts_ctr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [L1SCHED_TS_CTR_DL_LATE] = {"l1sched_ts:dl_late", "Downlink frames arrived too late to submit to lower layers"},</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_ts_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "l1sched_ts",</span><br><span style="color: hsl(120, 100%, 40%);">+ "L1 scheduler timeslot",</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_ts_ctr_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ l1sched_ts_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>@@ -582,7 +599,9 @@</span><br><span> struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);</span><br><span> </span><br><span> l1ts->mf_index = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->ctrs = rate_ctr_group_alloc(trx, &l1sched_ts_ctrg_desc, (trx->nr + 1) * 10 + tn);</span><br><span> INIT_LLIST_HEAD(&l1ts->dl_prims);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) {</span><br><span> struct l1sched_chan_state *chan_state;</span><br><span> chan_state = &l1ts->chan_state[i];</span><br><span>@@ -604,6 +623,8 @@</span><br><span> for (tn = 0; tn < ARRAY_SIZE(l1t->ts); tn++) {</span><br><span> struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);</span><br><span> msgb_queue_flush(&l1ts->dl_prims);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_free(l1ts->ctrs);</span><br><span style="color: hsl(120, 100%, 40%);">+ l1ts->ctrs = NULL;</span><br><span> for (i = 0; i < _TRX_CHAN_MAX; i++) {</span><br><span> struct l1sched_chan_state *chan_state;</span><br><span> chan_state = &l1ts->chan_state[i];</span><br><span>@@ -670,6 +691,7 @@</span><br><span> prim_fn, l1sap_fn, fn,</span><br><span> get_lchan_by_chan_nr(l1t->trx, chan_nr)->name,</span><br><span> trx_chan_desc[chan].name);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc2(l1ts->ctrs, L1SCHED_TS_CTR_DL_LATE);</span><br><span> /* unlink and free message */</span><br><span> llist_del(&msg->list);</span><br><span> msgb_free(msg);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18862">change 18862</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/+/18862"/><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: I76c3dd4020c6d74192b03b1d42413ae536da5f05 </div>
<div style="display:none"> Gerrit-Change-Number: 18862 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>