<p>iedemam has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23234">View Change</a></p><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>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>5 files changed, 33 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/34/23234/1</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 6b58c7e..dae5eff 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -17,6 +17,7 @@</span><br><span> #include "osmocom/bsc/bts_sm.h"</span><br><span> </span><br><span> enum bts_counter_id {</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_UPTIME_SEC,</span><br><span> BTS_CTR_CHREQ_TOTAL,</span><br><span> BTS_CTR_CHREQ_ATTEMPTED_EMERG,</span><br><span> BTS_CTR_CHREQ_ATTEMPTED_CALL,</span><br><span>@@ -670,3 +671,6 @@</span><br><span> </span><br><span> enum gsm_bts_type_variant str2btsvariant(const char *arg);</span><br><span> const char *btsvariant2str(enum gsm_bts_type_variant v);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define BTS_UPTIME_SAMPLE_INTERVAL 1 /* in seconds */</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_update_uptime(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 af1c8e8..c2de815 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1209,6 +1209,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 update each BTS's uptime counter. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list bts_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 b959c9f..0012129 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 update_bts_uptime_timer(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_update_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_uptime_timer, BTS_UPTIME_SAMPLE_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>@@ -129,6 +141,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_uptime_timer, update_bts_uptime_timer, net);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&net->bts_uptime_timer, BTS_UPTIME_SAMPLE_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 1d0979d..5be4d79 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -762,6 +762,9 @@</span><br><span> }</span><br><span> </span><br><span> const struct rate_ctr_desc bts_ctr_description[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_UPTIME_SEC] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "uptime:sec",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Uptime in seconds" },</span><br><span> [BTS_CTR_CHREQ_TOTAL] = \</span><br><span> { "chreq:total",</span><br><span> "Received channel requests" },</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 16fa201..5b0e7e4 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -64,6 +64,13 @@</span><br><span> return "disconnected";</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bts_update_uptime(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->oml_link && all_trx_rsl_connected_unlocked(bts)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_add(&bts->bts_ctrs->ctr[BTS_CTR_UPTIME_SEC], BTS_UPTIME_SAMPLE_INTERVAL);</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%);">+</span><br><span> struct gsm_bts_model bts_model_nanobts = {</span><br><span> .type = GSM_BTS_TYPE_NANOBTS,</span><br><span> .name = "nanobts",</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: 1 </div>
<div style="display:none"> Gerrit-Owner: iedemam <michael@kapsulate.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>