<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24978">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Clear BTS_STAT_CHAN_*_{TOTAL,USED} on bts disconnect<br><br>Adds gsm_bts_stats_reset() to clear the stats and calls it from the<br>different models.<br><br>Change-Id: Ic42687cd73e3546edaa99fb1268a5960ffa43b12<br>Related: SYS#5541<br>---<br>M include/osmocom/bsc/bts.h<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/bts_ericsson_rbs2000.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/bts_nokia_site.c<br>M src/osmo-bsc/bts_siemens_bs11.c<br>6 files changed, 27 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/78/24978/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 992c9bb..d2a1421 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -702,6 +702,8 @@</span><br><span> </span><br><span> int gsm_bts_set_c0_power_red(struct gsm_bts *bts, const uint8_t red);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void gsm_bts_stats_reset(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int gsm_bts_model_register(struct gsm_bts_model *model);</span><br><span> struct gsm_bts_model *bts_model_find(enum gsm_bts_type type);</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index cf3a6b8..18572e9 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -796,6 +796,26 @@</span><br><span>         return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void gsm_bts_stats_reset(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(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_CCCH_SDCCH4_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_TCH_F_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_TCH_F_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_TCH_H_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_TCH_H_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_SDCCH8_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_SDCCH8_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_TCH_F_PDCH_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_TCH_F_PDCH_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_SDCCH8_CBCH_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_USED), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_CHAN_OSMO_DYN_TOTAL), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const struct rate_ctr_desc bts_ctr_description[] = {</span><br><span>  [BTS_CTR_CHREQ_TOTAL] = \</span><br><span>            { "chreq:total",</span><br><span>diff --git a/src/osmo-bsc/bts_ericsson_rbs2000.c b/src/osmo-bsc/bts_ericsson_rbs2000.c</span><br><span>index 7d29657..b3d79b4 100644</span><br><span>--- a/src/osmo-bsc/bts_ericsson_rbs2000.c</span><br><span>+++ b/src/osmo-bsc/bts_ericsson_rbs2000.c</span><br><span>@@ -52,6 +52,7 @@</span><br><span> static int shutdown_om(struct gsm_bts *bts)</span><br><span> {</span><br><span>  gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+   gsm_bts_stats_reset(bts);</span><br><span> </span><br><span>        /* FIXME */</span><br><span>  return 0;</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 26e2196..27f6aee 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>@@ -32,6 +32,7 @@</span><br><span> #include <osmocom/gsm/tlv.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/stat_item.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span>@@ -557,6 +558,7 @@</span><br><span>        bts->oml_link = NULL;</span><br><span>     bts->uptime = 0;</span><br><span>  osmo_stat_item_dec(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_OML_CONNECTED), 1);</span><br><span style="color: hsl(120, 100%, 40%);">+      gsm_bts_stats_reset(bts);</span><br><span> </span><br><span>        /* Also drop the associated OSMO link */</span><br><span>     e1inp_sign_link_destroy(bts->osmo_link);</span><br><span>diff --git a/src/osmo-bsc/bts_nokia_site.c b/src/osmo-bsc/bts_nokia_site.c</span><br><span>index 3820ead..75ffa95 100644</span><br><span>--- a/src/osmo-bsc/bts_nokia_site.c</span><br><span>+++ b/src/osmo-bsc/bts_nokia_site.c</span><br><span>@@ -80,6 +80,7 @@</span><br><span> </span><br><span> static int shutdown_om(struct gsm_bts *bts)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+      gsm_bts_stats_reset(bts);</span><br><span>    /* TODO !? */</span><br><span>        return 0;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c</span><br><span>index 0d71ce2..818d84a 100644</span><br><span>--- a/src/osmo-bsc/bts_siemens_bs11.c</span><br><span>+++ b/src/osmo-bsc/bts_siemens_bs11.c</span><br><span>@@ -552,6 +552,7 @@</span><br><span>        /* Reset BTS Site manager resource */</span><br><span>        abis_nm_bs11_reset_resource(bts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_bts_stats_reset(bts);</span><br><span>    gsm_bts_all_ts_dispatch(bts, TS_EV_OML_DOWN, NULL);</span><br><span> </span><br><span>      return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24978">change 24978</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/+/24978"/><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: Ic42687cd73e3546edaa99fb1268a5960ffa43b12 </div>
<div style="display:none"> Gerrit-Change-Number: 24978 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>