<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19896">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix 'handover:*' counters: add missing / move increments<br><br>Move initial 'handover:attempted' counts from bsc_subscr_conn_fsm.c to<br>handover_fsm.c, where all the other counters are handled.<br><br>Add missing increments for the overall 'handover:*' counts.<br><br>Related: OS#4736<br>Change-Id: I783bdedafc0eb8f2df9ea100792846fecc7ccbf7<br>---<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/handover_fsm.c<br>2 files changed, 4 insertions(+), 7 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/96/19896/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><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 6871c4c..281ab71 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>@@ -382,13 +382,6 @@</span><br><span>              return;</span><br><span> </span><br><span>  case GSCON_EV_HANDOVER_START:</span><br><span style="color: hsl(0, 100%, 40%);">-           bts = conn_get_bts(conn);</span><br><span style="color: hsl(0, 100%, 40%);">-               rate_ctr_inc(&conn->network->bsc_ctrs->ctr[BSC_CTR_HANDOVER_ATTEMPTED]);</span><br><span style="color: hsl(0, 100%, 40%);">-           if (bts)</span><br><span style="color: hsl(0, 100%, 40%);">-                        rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_HANDOVER_ATTEMPTED]);</span><br><span style="color: hsl(0, 100%, 40%);">-                else</span><br><span style="color: hsl(0, 100%, 40%);">-                    rate_ctr_inc(&conn->network->bts_unknown_ctrs->ctr[BTS_CTR_HANDOVER_ATTEMPTED]);</span><br><span style="color: hsl(0, 100%, 40%);">-</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>                  LOGPFSML(fi, LOGL_ERROR, "Cannot transition to HANDOVER state, discarding\n");</span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 86f17ec..8fb8443 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -329,6 +329,7 @@</span><br><span>       * is to always create a handover_fsm instance, even if the target cell is not resolved yet. Any failure should</span><br><span>       * then call handover_end(), which ensures that the conn snaps back to a valid state. */</span><br><span>     handover_fsm_alloc(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+     ho_count(conn_get_bts(conn), CTR_HANDOVER_ATTEMPTED);</span><br><span> </span><br><span>    ho->from_hodec_id = req->from_hodec_id;</span><br><span>        ho->new_lchan_type = req->new_lchan_type == GSM_LCHAN_NONE ?</span><br><span>@@ -635,6 +636,7 @@</span><br><span>             break;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ho_count(ho->new_bts, CTR_HANDOVER_ATTEMPTED);</span><br><span>    ho_count(ho->new_bts, CTR_INTER_BSC_HO_IN_ATTEMPTED);</span><br><span> </span><br><span>         if (!ho->new_bts) {</span><br><span>@@ -917,7 +919,9 @@</span><br><span>         if (hdc && hdc->on_handover_end)</span><br><span>          hdc->on_handover_end(conn, result);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    ho_count_bsc(result_counter_BSC_HANDOVER(result));</span><br><span>   ho_count_bsc(result_counter_bsc(ho->scope, result));</span><br><span style="color: hsl(120, 100%, 40%);">+       ho_count_bts(bts, result_counter_BTS_HANDOVER(result));</span><br><span>      ho_count_bts(bts, result_counter_bts(ho->scope, result));</span><br><span> </span><br><span>     LOG_HO(conn, LOGL_INFO, "Result: %s\n", handover_result_name(result));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19896">change 19896</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/+/19896"/><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: I783bdedafc0eb8f2df9ea100792846fecc7ccbf7 </div>
<div style="display:none"> Gerrit-Change-Number: 19896 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>