Change in osmo-bsc[master]: fix 'handover:*' counters: add missing / move increments

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/19896 )

Change subject: fix 'handover:*' counters: add missing / move increments
......................................................................

fix 'handover:*' counters: add missing / move increments

Move initial 'handover:attempted' counts from bsc_subscr_conn_fsm.c to
handover_fsm.c, where all the other counters are handled.

Add missing increments for the overall 'handover:*' counts.

Related: OS#4736
Change-Id: I783bdedafc0eb8f2df9ea100792846fecc7ccbf7
---
M src/osmo-bsc/bsc_subscr_conn_fsm.c
M src/osmo-bsc/handover_fsm.c
2 files changed, 4 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 6871c4c..281ab71 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -382,13 +382,6 @@
 		return;
 
 	case GSCON_EV_HANDOVER_START:
-		bts = conn_get_bts(conn);
-		rate_ctr_inc(&conn->network->bsc_ctrs->ctr[BSC_CTR_HANDOVER_ATTEMPTED]);
-		if (bts)
-			rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_HANDOVER_ATTEMPTED]);
-		else
-			rate_ctr_inc(&conn->network->bts_unknown_ctrs->ctr[BTS_CTR_HANDOVER_ATTEMPTED]);
-
 		/* Rely on handover_fsm timeout */
 		if (osmo_fsm_inst_state_chg(fi, ST_HANDOVER, 0, 0))
 			LOGPFSML(fi, LOGL_ERROR, "Cannot transition to HANDOVER state, discarding\n");
diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c
index 4b54bb7..9ab96e3 100644
--- a/src/osmo-bsc/handover_fsm.c
+++ b/src/osmo-bsc/handover_fsm.c
@@ -323,6 +323,7 @@
 	 * is to always create a handover_fsm instance, even if the target cell is not resolved yet. Any failure should
 	 * then call handover_end(), which ensures that the conn snaps back to a valid state. */
 	handover_fsm_alloc(conn);
+	ho_count(conn_get_bts(conn), CTR_HANDOVER_ATTEMPTED);
 
 	ho->from_hodec_id = req->from_hodec_id;
 	ho->new_lchan_type = req->new_lchan_type == GSM_LCHAN_NONE ?
@@ -629,6 +630,7 @@
 		break;
 	}
 
+	ho_count(ho->new_bts, CTR_HANDOVER_ATTEMPTED);
 	ho_count(ho->new_bts, CTR_INTER_BSC_HO_IN_ATTEMPTED);
 
 	if (!ho->new_bts) {
@@ -919,7 +921,9 @@
 	if (hdc && hdc->on_handover_end)
 		hdc->on_handover_end(conn, result);
 
+	ho_count_bsc(result_counter_BSC_HANDOVER(result));
 	ho_count_bsc(result_counter_bsc(ho->scope, result));
+	ho_count_bts(bts, result_counter_BTS_HANDOVER(result));
 	ho_count_bts(bts, result_counter_bts(ho->scope, result));
 
 	LOG_HO(conn, LOGL_INFO, "Result: %s\n", handover_result_name(result));

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/19896
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I783bdedafc0eb8f2df9ea100792846fecc7ccbf7
Gerrit-Change-Number: 19896
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200830/7866a591/attachment.htm>