<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18109">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: report a number of configured BTS to a stats gauge.<br><br>It's useful to know how many BTS are actually configured to compare<br>it to a number of connected BTS's.<br><br>Change-Id: I41cb60f9cb962003227e4a7b63db05acbcdb6f4c<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/bsc_vty.c<br>3 files changed, 26 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 545019b..8173506 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1562,6 +1562,11 @@</span><br><span> bsc_ctr_description,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Constants for the BSC stats */</span><br><span style="color: hsl(120, 100%, 40%);">+enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_STAT_NUM_BTS_TOTAL,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct gsm_tz {</span><br><span> int override; /* if 0, use system's time zone instead. */</span><br><span> int hr; /* hour */</span><br><span>@@ -1588,7 +1593,9 @@</span><br><span> struct osmo_timer_list congestion_check_timer;</span><br><span> } hodec2;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* structures for keeping rate counters and gauge stats */</span><br><span> struct rate_ctr_group *bsc_ctrs;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_stat_item_group *bsc_statg;</span><br><span> </span><br><span> unsigned int num_bts;</span><br><span> struct llist_head bts_list;</span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index 18776f3..d08e9c8 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -44,6 +44,18 @@</span><br><span> #include <limits.h></span><br><span> #include <stdbool.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct osmo_stat_item_desc bsc_stat_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { "num_bts:total", "Number of configured BTS for this BSC", "", 16, 0 },</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 osmo_stat_item_group_desc bsc_statg_desc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_name_prefix = "bsc",</span><br><span style="color: hsl(120, 100%, 40%);">+ .group_description = "base station controller",</span><br><span style="color: hsl(120, 100%, 40%);">+ .class_id = OSMO_STATS_CLASS_GLOBAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .num_items = ARRAY_SIZE(bsc_stat_desc),</span><br><span style="color: hsl(120, 100%, 40%);">+ .item_desc = bsc_stat_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int bsc_shutdown_net(struct gsm_network *net)</span><br><span> {</span><br><span> struct gsm_bts *bts;</span><br><span>@@ -268,6 +280,12 @@</span><br><span> talloc_free(net);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ net->bsc_statg = osmo_stat_item_group_alloc(net, &bsc_statg_desc, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!net->bsc_statg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_free(net->bsc_ctrs);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(net);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> INIT_LLIST_HEAD(&net->bts_rejected);</span><br><span> gsm_net_update_ctype(net);</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index f8bcee9..0fd462f 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -2077,6 +2077,7 @@</span><br><span> /* allocate a new one */</span><br><span> bts = bsc_bts_alloc_register(gsmnet, GSM_BTS_TYPE_UNKNOWN,</span><br><span> HARDCODED_BSIC);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_inc(gsmnet->bsc_statg->items[BSC_STAT_NUM_BTS_TOTAL], 1);</span><br><span> /*</span><br><span> * Initialize bts->acc_ramp here. Else we could segfault while</span><br><span> * processing a configuration file with ACC ramping settings.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18109">change 18109</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/+/18109"/><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: I41cb60f9cb962003227e4a7b63db05acbcdb6f4c </div>
<div style="display:none"> Gerrit-Change-Number: 18109 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: ipse <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </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-MessageType: merged </div>