<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25507">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
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stat: add bts.N.num_trx:rsl_connected<br><br>Controversy: this duplicates bts.N.rsl_connected. I would like to add<br>this duplication for consistency, since we now have these counters:<br><br> bsc.0.num_trx:rsl_connected<br> bsc.0.num_trx:total<br> bts.N.num_trx:total<br><br>and the old<br><br> bts.N.rsl_connected<br><br>which does not fit well with above naming scheme. Any user will be<br>justified to expect a stat named bts.N.num_trx:rsl_connected as well.<br><br>Determine bts.N.num_trx:rsl_connected in the new function<br>bsc_update_connection_stats(), where the other num_trx:* are set.<br><br>Related: SYS#5542<br>Related: I5be1cb470930354c4561cbed301bc50a32484ed9 (osmo-ttcn3-hacks)<br>Depends: I137992a5479fc39bbceb6c6c2af9c227bd33b39b (libosmocore)<br>Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/bsc_stats.c<br>M src/osmo-bsc/bts.c<br>3 files changed, 8 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index f09d068..68654f2 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -175,6 +175,7 @@</span><br><span> BTS_STAT_RSL_CONNECTED,</span><br><span> BTS_STAT_LCHAN_BORKEN,</span><br><span> BTS_STAT_TS_BORKEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_STAT_NUM_TRX_RSL_CONNECTED,</span><br><span> BTS_STAT_NUM_TRX_TOTAL,</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c</span><br><span>index 3b96fed..7176809 100644</span><br><span>--- a/src/osmo-bsc/bsc_stats.c</span><br><span>+++ b/src/osmo-bsc/bsc_stats.c</span><br><span>@@ -162,6 +162,8 @@</span><br><span> trx_rsl_connected++;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_NUM_TRX_RSL_CONNECTED),</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_rsl_connected);</span><br><span> osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_NUM_TRX_TOTAL),</span><br><span> num_trx);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 4bda721..1e202df 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -1301,7 +1301,7 @@</span><br><span> "", 16, 0 },</span><br><span> [BTS_STAT_RSL_CONNECTED] = \</span><br><span> { "rsl_connected",</span><br><span style="color: hsl(0, 100%, 40%);">- "Number of RSL links connected",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of RSL links connected (same as num_trx:rsl_connected)",</span><br><span> "", 16, 0 },</span><br><span> [BTS_STAT_LCHAN_BORKEN] = \</span><br><span> { "lchan_borken",</span><br><span>@@ -1311,6 +1311,10 @@</span><br><span> { "ts_borken",</span><br><span> "Number of timeslots in the BORKEN state",</span><br><span> "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_STAT_NUM_TRX_RSL_CONNECTED] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "num_trx:rsl_connected",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Number of TRX in this BTS where RSL is up",</span><br><span style="color: hsl(120, 100%, 40%);">+ "" },</span><br><span> [BTS_STAT_NUM_TRX_TOTAL] = \</span><br><span> { "num_trx:total",</span><br><span> "Number of configured TRX in this BTS",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25507">change 25507</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-bsc/+/25507"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154 </div>
<div style="display:none"> Gerrit-Change-Number: 25507 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>