<p>daniel <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23234">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: add BTS uptime counter<br><br>Change-Id: Ib17674bbe95e828cebff12de9e0b30f06447ef6c<br>---<br>M include/osmocom/bsc/bts.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/bts.c<br>4 files changed, 32 insertions(+), 0 deletions(-)<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 bcc215d..7a491d9 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -143,6 +143,7 @@</span><br><span> extern const struct rate_ctr_group_desc bts_ctrg_desc;</span><br><span> </span><br><span> enum {</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_STAT_UPTIME_SECONDS,</span><br><span> BTS_STAT_CHAN_LOAD_AVERAGE,</span><br><span> BTS_STAT_CHAN_CCCH_SDCCH4_USED,</span><br><span> BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL,</span><br><span>@@ -646,6 +647,9 @@</span><br><span> </span><br><span> int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define BTS_STORE_UPTIME_INTERVAL 10 /* in seconds */</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_store_uptime(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> unsigned long long bts_uptime(const struct gsm_bts *bts);</span><br><span> </span><br><span> char *get_model_oml_status(const struct gsm_bts *bts);</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 9aecd2c..dc10dc6 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1216,6 +1216,9 @@</span><br><span> /* Timer for periodic channel load measurements to maintain each BTS's T3122. */</span><br><span> struct osmo_timer_list t3122_chan_load_timer;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Timer to write each BTS's uptime counter state to the stats system. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list bts_store_uptime_timer;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct {</span><br><span> struct mgcp_client_conf *conf;</span><br><span> struct mgcp_client *client;</span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index b572f27..24596f4 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -85,6 +85,18 @@</span><br><span> osmo_timer_schedule(&net->t3122_chan_load_timer, T3122_CHAN_LOAD_SAMPLE_INTERVAL, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void bsc_store_bts_uptime(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bts, &net->bts_list, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_store_uptime(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Keep this timer ticking. */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&net->bts_store_uptime_timer, BTS_STORE_UPTIME_INTERVAL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct gsm_network *bsc_network_init(void *ctx)</span><br><span> {</span><br><span> struct gsm_network *net = gsm_network_init(ctx);</span><br><span>@@ -128,6 +140,10 @@</span><br><span> osmo_timer_setup(&net->t3122_chan_load_timer, update_t3122_chan_load_timer, net);</span><br><span> osmo_timer_schedule(&net->t3122_chan_load_timer, T3122_CHAN_LOAD_SAMPLE_INTERVAL, 0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Init uptime tracking timer. */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&net->bts_store_uptime_timer, bsc_store_bts_uptime, net);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&net->bts_store_uptime_timer, BTS_STORE_UPTIME_INTERVAL, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> net->cbc->net = net;</span><br><span> net->cbc->mode = BSC_CBC_LINK_MODE_DISABLED;</span><br><span> net->cbc->server.local_addr = bsc_cbc_default_server_local_addr;</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 2192c56..17659a1 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -556,6 +556,11 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bts_store_uptime(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_set(bts->bts_statg->items[BTS_STAT_UPTIME_SECONDS], bts_uptime(bts));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> unsigned long long bts_uptime(const struct gsm_bts *bts)</span><br><span> {</span><br><span> struct timespec tp;</span><br><span>@@ -1112,6 +1117,10 @@</span><br><span> };</span><br><span> </span><br><span> const struct osmo_stat_item_desc bts_stat_desc[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_STAT_UPTIME_SECONDS] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "uptime:seconds",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Seconds of uptime",</span><br><span style="color: hsl(120, 100%, 40%);">+ "s", 60, 0 },</span><br><span> [BTS_STAT_CHAN_LOAD_AVERAGE] = \</span><br><span> { "chanloadavg",</span><br><span> "Channel load average",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23234">change 23234</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/+/23234"/><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: Ib17674bbe95e828cebff12de9e0b30f06447ef6c </div>
<div style="display:none"> Gerrit-Change-Number: 23234 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: iedemam <michael@kapsulate.com> </div>
<div style="display:none"> Gerrit-Assignee: daniel <dwillmann@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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>