<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24681">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce counters to track SRVCC procedures<br><br>Related: SYS#5337<br>Change-Id: I5c20da56d465dbcf4366130394f7c42635a24cc7<br>---<br>M include/osmocom/bsc/bts.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/handover_fsm.c<br>4 files changed, 53 insertions(+), 0 deletions(-)<br><br></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 4436ed0..b6980d1 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -137,6 +137,13 @@</span><br><span> BTS_CTR_INTER_BSC_HO_IN_FAILED,</span><br><span> BTS_CTR_INTER_BSC_HO_IN_TIMEOUT,</span><br><span> BTS_CTR_INTER_BSC_HO_IN_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_SRVCC_ATTEMPTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_SRVCC_COMPLETED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_SRVCC_STOPPED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_SRVCC_NO_CHANNEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_SRVCC_TIMEOUT,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_SRVCC_FAILED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_CTR_SRVCC_ERROR,</span><br><span> };</span><br><span> </span><br><span> extern const struct rate_ctr_desc bts_ctr_description[];</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 37e3899..2a73f46 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1116,6 +1116,13 @@</span><br><span> BSC_CTR_INTER_BSC_HO_IN_FAILED,</span><br><span> BSC_CTR_INTER_BSC_HO_IN_TIMEOUT,</span><br><span> BSC_CTR_INTER_BSC_HO_IN_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_SRVCC_ATTEMPTED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_SRVCC_COMPLETED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_SRVCC_STOPPED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_SRVCC_NO_CHANNEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_SRVCC_TIMEOUT,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_SRVCC_FAILED,</span><br><span style="color: hsl(120, 100%, 40%);">+ BSC_CTR_SRVCC_ERROR,</span><br><span> BSC_CTR_PAGING_ATTEMPTED,</span><br><span> BSC_CTR_PAGING_DETACHED,</span><br><span> BSC_CTR_PAGING_RESPONDED,</span><br><span>@@ -1181,6 +1188,14 @@</span><br><span> [BSC_CTR_INTER_BSC_HO_IN_ERROR] = {"interbsc_ho_in:error",</span><br><span> "Handover from remote BSS failed for other reason"},</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_SRVCC_ATTEMPTED] = {"srvcc:attempted", "Intra-BSC SRVCC attempts"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_SRVCC_COMPLETED] = {"srvcc:completed", "Intra-BSC SRVCC completed"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_SRVCC_STOPPED] = {"srvcc:stopped", "Connection ended during HO"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_SRVCC_NO_CHANNEL] = {"srvcc:no_channel", "Failure to allocate lchan for HO"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_SRVCC_TIMEOUT] = {"srvcc:timeout", "SRVCC timed out"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_SRVCC_FAILED] = {"srvcc:failed", "Received SRVCC Fail messages"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_SRVCC_ERROR] = {"srvcc:error", "Re-assignment failed for other reason"},</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber"},</span><br><span> [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Paging request send failures because no responsible BTS was found"},</span><br><span> [BSC_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful response"},</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index e140565..b64890f 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -1110,6 +1110,28 @@</span><br><span> [BTS_CTR_INTER_BSC_HO_IN_ERROR] = \</span><br><span> { "interbsc_ho_in:error",</span><br><span> "Handover from remote BSS failed for other reason" },</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_SRVCC_ATTEMPTED] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "srvcc:attempted",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Intra-BSC handover attempts" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_SRVCC_COMPLETED] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "srvcc:completed",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Intra-BSC handover completed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_SRVCC_STOPPED] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "srvcc:stopped",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Connection ended during HO" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_SRVCC_NO_CHANNEL] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "srvcc:no_channel",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failure to allocate lchan for HO" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_SRVCC_TIMEOUT] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "srvcc:timeout",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Handover timed out" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_SRVCC_FAILED] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "srvcc:failed",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Received Handover Fail messages" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BTS_CTR_SRVCC_ERROR] = \</span><br><span style="color: hsl(120, 100%, 40%);">+ { "srvcc:error",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Re-assignment failed for other reason" },</span><br><span> };</span><br><span> </span><br><span> const struct rate_ctr_group_desc bts_ctrg_desc = {</span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 08b1dc7..cae5167 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -725,6 +725,7 @@</span><br><span> conn->fast_return.last_eutran_plmn_valid = true;</span><br><span> memcpy(&conn->fast_return.last_eutran_plmn, &req->last_eutran_plmn,</span><br><span> sizeof(conn->fast_return.last_eutran_plmn));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_count(ho->new_bts, CTR_SRVCC_ATTEMPTED);</span><br><span> }</span><br><span> </span><br><span> lchan_activate(ho->new_lchan, &info);</span><br><span>@@ -824,6 +825,9 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+FUNC_RESULT_COUNTER(BSC, SRVCC)</span><br><span style="color: hsl(120, 100%, 40%);">+FUNC_RESULT_COUNTER(BTS, SRVCC)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void send_handover_performed(struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = conn->lchan;</span><br><span>@@ -977,6 +981,11 @@</span><br><span> ho_count_bsc(result_counter_bsc(ho->scope, result));</span><br><span> 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 style="color: hsl(120, 100%, 40%);">+ if (ho->scope & HO_INTER_BSC_IN && conn->fast_return.last_eutran_plmn_valid) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* From outside local BSC and with Last EUTRAN PLMN Id => SRVCC */</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_count_bsc(result_counter_BSC_SRVCC(result));</span><br><span style="color: hsl(120, 100%, 40%);">+ ho_count_bts(bts, result_counter_BTS_SRVCC(result));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> LOG_HO(conn, LOGL_INFO, "Result: %s\n", handover_result_name(result));</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24681">change 24681</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/+/24681"/><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: I5c20da56d465dbcf4366130394f7c42635a24cc7 </div>
<div style="display:none"> Gerrit-Change-Number: 24681 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>