<p>ipse has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18092">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: Add a stats gauge for the MSC link status.<br><br>Change-Id: Ibe4b29056ba704a27b925cfdba49f343ee34f428<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/a_reset.c<br>M src/osmo-bsc/bsc_init.c<br>3 files changed, 22 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/18092/1</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 11a4b5f..e85796c 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1554,6 +1554,10 @@</span><br><span> bsc_ctr_description,</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%);">+ BSC_STAT_MSC_LINK,</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>@@ -1581,6 +1585,7 @@</span><br><span> } hodec2;</span><br><span> </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/a_reset.c b/src/osmo-bsc/a_reset.c</span><br><span>index 3f51278..9d7be85 100644</span><br><span>--- a/src/osmo-bsc/a_reset.c</span><br><span>+++ b/src/osmo-bsc/a_reset.c</span><br><span>@@ -71,7 +71,9 @@</span><br><span> {</span><br><span> struct reset_ctx *reset_ctx = (struct reset_ctx *)fi->priv;</span><br><span> OSMO_ASSERT(reset_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = reset_ctx->priv;</span><br><span> LOGPFSML(fi, LOGL_NOTICE, "SIGTRAN connection succeeded.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_set(msc->network->bsc_statg->items[BSC_STAT_MSC_LINK], 1);</span><br><span> </span><br><span> reset_ctx->conn_loss_counter = 0;</span><br><span> osmo_fsm_inst_state_chg(fi, ST_CONN, 0, 0);</span><br><span>@@ -86,7 +88,9 @@</span><br><span> switch (event) {</span><br><span> case EV_N_DISCONNECT:</span><br><span> if (reset_ctx->conn_loss_counter >= BAD_CONNECTION_THRESOLD) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = reset_ctx->priv;</span><br><span> LOGPFSML(fi, LOGL_NOTICE, "SIGTRAN connection down, reconnecting...\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_set(msc->network->bsc_statg->items[BSC_STAT_MSC_LINK], 0);</span><br><span> osmo_fsm_inst_state_chg(fi, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO);</span><br><span> } else</span><br><span> reset_ctx->conn_loss_counter++;</span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index 18776f3..9d0ee86 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%);">+ { "msc_link", "MSC link status.", "", 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,7 @@</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> </span><br><span> INIT_LLIST_HEAD(&net->bts_rejected);</span><br><span> gsm_net_update_ctype(net);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18092">change 18092</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/+/18092"/><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: Ibe4b29056ba704a27b925cfdba49f343ee34f428 </div>
<div style="display:none"> Gerrit-Change-Number: 18092 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ipse <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>