<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26070">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic tweaks on handover counting code<br><br>I was a bit confused that grep did not find HO counters being used, so<br>let's add some comments to better explain and provide a grep hook.<br><br>Related: SYS#4878<br>Change-Id: I242de13e657286e09428a8ca6e583d8b5155faa2<br>---<br>M src/osmo-bsc/handover_fsm.c<br>1 file changed, 25 insertions(+), 3 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/70/26070/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 255478f..e61262f 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -108,10 +108,13 @@</span><br><span> rate_ctr_inc(rate_ctr_group_get_ctr(conn->network->bts_unknown_ctrs, counter)); \</span><br><span> } while(0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Count handover result on both bts and bsc level.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Call with 'counter' being the counter name without the "BSC_"/"BTS_" part,</span><br><span style="color: hsl(120, 100%, 40%);">+ * e.g. ho_count(conn_get_bts(conn), CTR_HANDOVER_ATTEMPTED); */</span><br><span> #define ho_count(bts, counter) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- ho_count_bsc(BSC_##counter); \</span><br><span style="color: hsl(0, 100%, 40%);">- ho_count_bts(bts, BTS_##counter); \</span><br><span style="color: hsl(0, 100%, 40%);">-} while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_count_bsc(BSC_##counter); \</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_count_bts(bts, BTS_##counter); \</span><br><span style="color: hsl(120, 100%, 40%);">+ } while(0)</span><br><span> </span><br><span> static uint8_t g_next_ho_ref = 1;</span><br><span> </span><br><span>@@ -748,6 +751,23 @@</span><br><span> lchan_activate(ho->new_lchan, &info);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Create functions result_counter_{BSC,BTS}_{HANDOVER,...}(), to evaluate the handover result and return</span><br><span style="color: hsl(120, 100%, 40%);">+ * BSC_CTR_HANDOVER_ATTEMPTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BSC_CTR_HANDOVER_COMPLETED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BSC_CTR_HANDOVER_STOPPED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BSC_CTR_HANDOVER_NO_CHANNEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BSC_CTR_HANDOVER_TIMEOUT,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BSC_CTR_HANDOVER_FAILED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BSC_CTR_HANDOVER_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ * or</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS_CTR_HANDOVER_ATTEMPTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS_CTR_HANDOVER_COMPLETED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS_CTR_HANDOVER_STOPPED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS_CTR_HANDOVER_NO_CHANNEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS_CTR_HANDOVER_TIMEOUT,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS_CTR_HANDOVER_FAILED,</span><br><span style="color: hsl(120, 100%, 40%);">+ * BTS_CTR_HANDOVER_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> #define FUNC_RESULT_COUNTER(obj, name) \</span><br><span> static int result_counter_##obj##_##name(enum handover_result result) \</span><br><span> { \</span><br><span>@@ -773,6 +793,7 @@</span><br><span> FUNC_RESULT_COUNTER(BSC, INTRA_BSC_HO)</span><br><span> FUNC_RESULT_COUNTER(BSC, INTER_BSC_HO_IN)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* INTRA_BSC_HO_OUT does not have a NO_CHANNEL result, so can't do this with FUNC_RESULT_COUNTER() macro. */</span><br><span> static int result_counter_BSC_INTER_BSC_HO_OUT(enum handover_result result) {</span><br><span> switch (result) {</span><br><span> case HO_RESULT_OK:</span><br><span>@@ -810,6 +831,7 @@</span><br><span> FUNC_RESULT_COUNTER(BTS, INTRA_BSC_HO)</span><br><span> FUNC_RESULT_COUNTER(BTS, INTER_BSC_HO_IN)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* INTRA_BSC_HO_OUT does not have a NO_CHANNEL result, so can't do this with FUNC_RESULT_COUNTER() macro. */</span><br><span> static int result_counter_BTS_INTER_BSC_HO_OUT(enum handover_result result) {</span><br><span> switch (result) {</span><br><span> case HO_RESULT_OK:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/26070">change 26070</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/+/26070"/><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: I242de13e657286e09428a8ca6e583d8b5155faa2 </div>
<div style="display:none"> Gerrit-Change-Number: 26070 </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>