<p>daniel has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19735">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add bts counters to count BTS events where we don't have a bts<br><br>In some (error-) cases we might be unable to determine which BTS to use<br>when counting handover events. We don't want to loose these events<br>because then ctr(bsc) == sum(ctr(bsc->bts)) would not be true anymore.<br><br>Those events are now counted by a counter in struct gsm_network which<br>uses an index that is out of range for regular BTS (65536).<br><br>Change-Id: Ic0f3edd5dc014c4eac5e8423133633a3e5d4c13e<br>Related: SYS#4877<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/handover_fsm.c<br>4 files changed, 45 insertions(+), 19 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/35/19735/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 60db07b..33b2ec1 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1089,6 +1089,11 @@</span><br><span> BSC_STAT_NUM_BTS_TOTAL,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* BTS counter index if a BTS could not be found</span><br><span style="color: hsl(120, 100%, 40%);">+ * Currently we are limited to bts 0 - 255 in the VTY, but that might change in</span><br><span style="color: hsl(120, 100%, 40%);">+ * the future so use 2**16 */</span><br><span style="color: hsl(120, 100%, 40%);">+#define BTS_STAT_IDX_UNKNOWN (UINT16_MAX + 1)</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>@@ -1123,6 +1128,11 @@</span><br><span> struct llist_head bts_list;</span><br><span> struct llist_head bts_rejected;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* BTS-based counters when we can't find the actual BTS</span><br><span style="color: hsl(120, 100%, 40%);">+ * e.g. when conn->lchan is NULL */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rate_ctr_group *bts_unknown_ctrs;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_stat_item_group *bts_unknown_statg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* see gsm_network_T_defs */</span><br><span> struct osmo_tdef *T_defs;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index e45b5e8..22eba50 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -90,8 +90,7 @@</span><br><span> </span><br><span> net->cbc = talloc_zero(net, struct bsc_cbc_link);</span><br><span> if (!net->cbc) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(net);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_out;</span><br><span> }</span><br><span> </span><br><span> /* Init back pointer */</span><br><span>@@ -104,16 +103,19 @@</span><br><span> </span><br><span> /* init statistics */</span><br><span> net->bsc_ctrs = rate_ctr_group_alloc(net, &bsc_ctrg_desc, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!net->bsc_ctrs) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(net);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!net->bsc_ctrs)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_out;</span><br><span> net->bsc_statg = osmo_stat_item_group_alloc(net, &bsc_statg_desc, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!net->bsc_statg) {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_group_free(net->bsc_ctrs);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(net);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!net->bsc_statg)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_free_bsc_ctr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* init statistics */</span><br><span style="color: hsl(120, 100%, 40%);">+ net->bts_unknown_ctrs = rate_ctr_group_alloc(net, &bts_ctrg_desc, BTS_STAT_IDX_UNKNOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!net->bts_unknown_ctrs)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_free_bsc_ctr_stat;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->bts_unknown_statg = osmo_stat_item_group_alloc(net, &bts_statg_desc, BTS_STAT_IDX_UNKNOWN);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!net->bts_unknown_statg)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto err_free_all;</span><br><span> </span><br><span> INIT_LLIST_HEAD(&net->bts_rejected);</span><br><span> gsm_net_update_ctype(net);</span><br><span>@@ -134,6 +136,16 @@</span><br><span> net->cbc->config.listen_hostname = talloc_strdup(net->cbc, "127.0.0.1");</span><br><span> </span><br><span> return net;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+err_free_all:</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_free(net->bts_unknown_ctrs);</span><br><span style="color: hsl(120, 100%, 40%);">+err_free_bsc_ctr_stat:</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_group_free(net->bsc_statg);</span><br><span style="color: hsl(120, 100%, 40%);">+err_free_bsc_ctr:</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%);">+err_out:</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> }</span><br><span> </span><br><span> int bsc_network_alloc(void)</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index 04718da..22aa70a 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -386,6 +386,8 @@</span><br><span> rate_ctr_inc(&conn->network->bsc_ctrs->ctr[BSC_CTR_HANDOVER_ATTEMPTED]);</span><br><span> if (bts)</span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_HANDOVER_ATTEMPTED]);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->network->bts_unknown_ctrs->ctr[BTS_CTR_HANDOVER_ATTEMPTED]);</span><br><span> </span><br><span> /* Rely on handover_fsm timeout */</span><br><span> if (osmo_fsm_inst_state_chg(fi, ST_HANDOVER, 0, 0))</span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index edf91e7..3e1ee9a 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -96,6 +96,8 @@</span><br><span> bts_ctr_description[counter].description); \</span><br><span> if (bts) \</span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[counter]); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else \</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->network->bts_unknown_ctrs->ctr[counter]); \</span><br><span> } while(0)</span><br><span> </span><br><span> #define ho_count(bts, counter) do { \</span><br><span>@@ -701,7 +703,6 @@</span><br><span> } \</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FUNC_RESULT_COUNTER(BSC, ASSIGNMENT)</span><br><span> FUNC_RESULT_COUNTER(BSC, HANDOVER)</span><br><span> FUNC_RESULT_COUNTER(BSC, INTRA_CELL_HO)</span><br><span> FUNC_RESULT_COUNTER(BSC, INTRA_BSC_HO)</span><br><span>@@ -724,13 +725,14 @@</span><br><span> static int result_counter_bsc(enum handover_scope scope, enum handover_result result)</span><br><span> {</span><br><span> switch (scope) {</span><br><span style="color: hsl(0, 100%, 40%);">- case HO_INTRA_CELL:</span><br><span style="color: hsl(0, 100%, 40%);">- return result_counter_BSC_INTRA_CELL_HO(result);</span><br><span> default:</span><br><span> LOGP(DHO, LOGL_ERROR, "invalid enum handover_scope value: %s\n",</span><br><span> handover_scope_name(scope));</span><br><span style="color: hsl(0, 100%, 40%);">- /* use "normal" HO_INTRA_BSC counter... */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* use "normal" HO counter... */</span><br><span> case HO_NO_HANDOVER:</span><br><span style="color: hsl(120, 100%, 40%);">+ return result_counter_BSC_HANDOVER(result);</span><br><span style="color: hsl(120, 100%, 40%);">+ case HO_INTRA_CELL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return result_counter_BSC_INTRA_CELL_HO(result);</span><br><span> case HO_INTRA_BSC:</span><br><span> return result_counter_BSC_INTRA_BSC_HO(result);</span><br><span> case HO_INTER_BSC_OUT:</span><br><span>@@ -740,7 +742,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FUNC_RESULT_COUNTER(BTS, ASSIGNMENT)</span><br><span> FUNC_RESULT_COUNTER(BTS, HANDOVER)</span><br><span> FUNC_RESULT_COUNTER(BTS, INTRA_CELL_HO)</span><br><span> FUNC_RESULT_COUNTER(BTS, INTRA_BSC_HO)</span><br><span>@@ -763,13 +764,14 @@</span><br><span> static int result_counter_bts(enum handover_scope scope, enum handover_result result)</span><br><span> {</span><br><span> switch (scope) {</span><br><span style="color: hsl(0, 100%, 40%);">- case HO_INTRA_CELL:</span><br><span style="color: hsl(0, 100%, 40%);">- return result_counter_BTS_INTRA_CELL_HO(result);</span><br><span> default:</span><br><span> LOGP(DHO, LOGL_ERROR, "invalid enum handover_scope value: %s\n",</span><br><span> handover_scope_name(scope));</span><br><span style="color: hsl(0, 100%, 40%);">- /* use "normal" HO_INTRA_BSC counter... */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* use "normal" HO counter... */</span><br><span> case HO_NO_HANDOVER:</span><br><span style="color: hsl(120, 100%, 40%);">+ return result_counter_BTS_HANDOVER(result);</span><br><span style="color: hsl(120, 100%, 40%);">+ case HO_INTRA_CELL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return result_counter_BTS_INTRA_CELL_HO(result);</span><br><span> case HO_INTRA_BSC:</span><br><span> return result_counter_BTS_INTRA_BSC_HO(result);</span><br><span> case HO_INTER_BSC_OUT:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19735">change 19735</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/+/19735"/><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: Ic0f3edd5dc014c4eac5e8423133633a3e5d4c13e </div>
<div style="display:none"> Gerrit-Change-Number: 19735 </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>