<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25226">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add stat items bsc.0.num_msc:connected, .num_msc:total<br><br>We already have MSC connection stat items, but for hysterical raisins<br>there are separate such stats for each MSC. Hence we have N connection<br>counters, each being either 0 or 1, for a single MSC.<br><br>Add a new stat counting the *overall* MSCs that are connected,<br>and one indicating the total number of configured MSCs.<br><br>Related: SYS#5542<br>Related: I178dcf4516606aa561d47b06061b8a416d3c40cf (osmo-ttcn3-hacks)<br>Change-Id: If76bbf9b3adb64c68d5c31c6b526fa71a99996ae<br>---<br>M include/osmocom/bsc/bsc_stats.h<br>M src/osmo-bsc/a_reset.c<br>M src/osmo-bsc/bsc_stats.c<br>3 files changed, 8 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_stats.h b/include/osmocom/bsc/bsc_stats.h</span><br><span>index 8fcd5a0..639f87f 100644</span><br><span>--- a/include/osmocom/bsc/bsc_stats.h</span><br><span>+++ b/include/osmocom/bsc/bsc_stats.h</span><br><span>@@ -88,6 +88,8 @@</span><br><span> /* OsmoBSC stat_item indexes */</span><br><span> enum {</span><br><span> BSC_STAT_NUM_BTS_TOTAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_STAT_NUM_MSC_CONNECTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_STAT_NUM_MSC_TOTAL,</span><br><span> };</span><br><span> </span><br><span> /* BTS counter index if a BTS could not be found</span><br><span>diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c</span><br><span>index 0befd72..d23ffa7 100644</span><br><span>--- a/src/osmo-bsc/a_reset.c</span><br><span>+++ b/src/osmo-bsc/a_reset.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include <osmocom/bsc/bsc_msc_data.h></span><br><span> #include <osmocom/bsc/osmo_bsc_sigtran.h></span><br><span> #include <osmocom/bsc/bssmap_reset.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_stats.h></span><br><span> </span><br><span> static void a_reset_tx_reset(void *data)</span><br><span> {</span><br><span>@@ -43,6 +44,7 @@</span><br><span> struct bsc_msc_data *msc = data;</span><br><span> LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is up\n", msc->nr);</span><br><span> osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1);</span><br><span> osmo_signal_dispatch(SS_MSC, S_MSC_CONNECTED, msc);</span><br><span> }</span><br><span> </span><br><span>@@ -51,6 +53,7 @@</span><br><span> struct bsc_msc_data *msc = data;</span><br><span> LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is down\n", msc->nr);</span><br><span> osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1);</span><br><span> osmo_signal_dispatch(SS_MSC, S_MSC_LOST, msc);</span><br><span> osmo_bsc_sigtran_reset(msc);</span><br><span> }</span><br><span>@@ -76,6 +79,7 @@</span><br><span> }</span><br><span> </span><br><span> msc->a.bssmap_reset = bssmap_reset_alloc(msc, name, &cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_TOTAL), 1);</span><br><span> }</span><br><span> </span><br><span> /* Confirm that we successfully received a reset acknowledge message */</span><br><span>diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c</span><br><span>index 8fc4c38..36d38c2 100644</span><br><span>--- a/src/osmo-bsc/bsc_stats.c</span><br><span>+++ b/src/osmo-bsc/bsc_stats.c</span><br><span>@@ -111,6 +111,8 @@</span><br><span> </span><br><span> static const struct osmo_stat_item_desc bsc_stat_desc[] = {</span><br><span> [BSC_STAT_NUM_BTS_TOTAL] = { "num_bts:total", "Number of configured BTS for this BSC", "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_STAT_NUM_MSC_CONNECTED] = { "num_msc:connected", "Number of actively connected MSCs", "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_STAT_NUM_MSC_TOTAL] = { "num_msc:total", "Number of configured MSCs, not necessarily connected", "", 1, 0 },</span><br><span> };</span><br><span> </span><br><span> const struct osmo_stat_item_group_desc bsc_statg_desc = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25226">change 25226</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/+/25226"/><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: If76bbf9b3adb64c68d5c31c6b526fa71a99996ae </div>
<div style="display:none"> Gerrit-Change-Number: 25226 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>