<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19107">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
neels: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Introduce rate counter for scheduler timerfd missed FNs<br><br>This should provide a quick way to check if the system is frequently<br>overloaded over time and hence downlink FNs are scheduled later than<br>expected.<br><br>Change-Id: I0051b9ab18ebc9f92db11374d856de94f155efa4<br>---<br>M src/osmo-bts-trx/l1_if.h<br>M src/osmo-bts-trx/main.c<br>M src/osmo-bts-trx/scheduler_trx.c<br>3 files changed, 25 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h</span><br><span>index 3fda726..7f60ca3 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.h</span><br><span>+++ b/src/osmo-bts-trx/l1_if.h</span><br><span>@@ -1,6 +1,8 @@</span><br><span> #ifndef L1_IF_H_TRX</span><br><span> #define L1_IF_H_TRX</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmo-bts/scheduler.h></span><br><span> #include <osmo-bts/phy_link.h></span><br><span> #include "trx_if.h"</span><br><span>@@ -24,6 +26,11 @@</span><br><span> * send burst data for the missing frame numbers.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* bts-trx specific rate counters */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ BTSTRX_CTR_SCHED_DL_MISS_FN,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! clock state of a given TRX */</span><br><span> struct osmo_trx_clock_state {</span><br><span> /*! number of FN periods without TRX clock indication */</span><br><span>@@ -47,6 +54,7 @@</span><br><span> /* gsm_bts->model_priv, specific to osmo-bts-trx */</span><br><span> struct bts_trx_priv {</span><br><span> struct osmo_trx_clock_state clk_s;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *ctrs; /* bts-trx specific rate counters */</span><br><span> };</span><br><span> </span><br><span> struct trx_config {</span><br><span>diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c</span><br><span>index 0d2a1f7..d8cbbaa 100644</span><br><span>--- a/src/osmo-bts-trx/main.c</span><br><span>+++ b/src/osmo-bts-trx/main.c</span><br><span>@@ -43,6 +43,8 @@</span><br><span> #include <osmocom/core/gsmtap.h></span><br><span> #include <osmocom/core/gsmtap_util.h></span><br><span> #include <osmocom/core/bits.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 <osmo-bts/gsm_data.h></span><br><span> #include <osmo-bts/phy_link.h></span><br><span>@@ -59,6 +61,18 @@</span><br><span> #include "l1_if.h"</span><br><span> #include "trx_if.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct rate_ctr_desc btstrx_ctr_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTSTRX_CTR_SCHED_DL_MISS_FN] = {"trx_clk:sched_dl_miss_fn",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Downlink frames scheduled later than expected due to missed timerfd event (due to high system load)"},</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 btstrx_ctrg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts-trx",</span><br><span style="color: hsl(120, 100%, 40%);">+ "osmo-bts-trx specific counters",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ ARRAY_SIZE(btstrx_ctr_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ btstrx_ctr_desc</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* dummy, since no direct dsp support */</span><br><span> uint32_t trx_get_hlayer1(struct gsm_bts_trx *trx)</span><br><span> {</span><br><span>@@ -99,6 +113,7 @@</span><br><span> {</span><br><span> struct bts_trx_priv *bts_trx = talloc_zero(bts, struct bts_trx_priv);</span><br><span> bts_trx->clk_s.fn_timer_ofd.fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_trx->ctrs = rate_ctr_group_alloc(bts_trx, &btstrx_ctrg_desc, 0);</span><br><span> </span><br><span> bts->model_priv = bts_trx;</span><br><span> bts->variant = BTS_OSMO_TRX;</span><br><span>diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>index 472bae8..fcd1eee 100644</span><br><span>--- a/src/osmo-bts-trx/scheduler_trx.c</span><br><span>+++ b/src/osmo-bts-trx/scheduler_trx.c</span><br><span>@@ -158,7 +158,8 @@</span><br><span> </span><br><span> if (expire_count > 1) {</span><br><span> LOGP(DL1C, LOGL_NOTICE, "FN timer expire_count=%"PRIu64": We missed %"PRIu64" timers\n",</span><br><span style="color: hsl(0, 100%, 40%);">- expire_count, expire_count-1);</span><br><span style="color: hsl(120, 100%, 40%);">+ expire_count, expire_count - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&bts_trx->ctrs->ctr[BTSTRX_CTR_SCHED_DL_MISS_FN], expire_count - 1);</span><br><span> }</span><br><span> </span><br><span> /* check if transceiver is still alive */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19107">change 19107</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/+/19107"/><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: I0051b9ab18ebc9f92db11374d856de94f155efa4 </div>
<div style="display:none"> Gerrit-Change-Number: 19107 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>