MSC pooling: add rate counters

Tests for these counters are added in I2006f1def5352b4b73d0159bfcaa2da9c64bfe3f
(osmo-ttcn3-hacks).

Change-Id: I2ded757958dfa62b502efbab765203bcadf899e2

4 files changed, 67 insertions, 1 deletions

diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h
index f19b9a04b..b1fe14d2f 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -96,6 +96,13 @@ enum {
 	MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE,
 	MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE,
 	MSC_CTR_BSSMAP_TX_DT1_DTAP,
+
+	MSC_CTR_MSCPOOL_SUBSCR_NEW,
+	MSC_CTR_MSCPOOL_SUBSCR_REATTACH,
+	MSC_CTR_MSCPOOL_SUBSCR_KNOWN,
+	MSC_CTR_MSCPOOL_SUBSCR_PAGED,
+	MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST,
+	MSC_CTR_MSCPOOL_EMERG_FORWARDED,
 };
 
 /* Constants for the MSC stats */
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 38047d29d..987470649 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1558,6 +1558,9 @@ enum {
 	BSC_CTR_PAGING_RESPONDED,
 	BSC_CTR_PAGING_NO_ACTIVE_PAGING,
 	BSC_CTR_UNKNOWN_UNIT_ID,
+	BSC_CTR_MSCPOOL_SUBSCR_NO_MSC,
+	BSC_CTR_MSCPOOL_EMERG_FORWARDED,
+	BSC_CTR_MSCPOOL_EMERG_LOST,
 };
 
 static const struct rate_ctr_desc bsc_ctr_description[] = {
@@ -1604,6 +1607,13 @@ static const struct rate_ctr_desc bsc_ctr_description[] = {
 	[BSC_CTR_PAGING_NO_ACTIVE_PAGING] =	{"paging:no_active_paging", "Paging response without an active paging request (arrived after paging expiration?)."},
 
 	[BSC_CTR_UNKNOWN_UNIT_ID] = 		{"abis:unknown_unit_id", "Connection attempts from unknown IPA CCM Unit ID."},
+
+	[BSC_CTR_MSCPOOL_SUBSCR_NO_MSC] =	{"mscpool:subscr:no_msc",
+						 "Complete Layer 3 requests lost because no connected MSC is found available."},
+	[BSC_CTR_MSCPOOL_EMERG_FORWARDED] =	{"mscpool:emerg:forwarded",
+						 "Emergency call requests forwarded to an MSC (see also per-MSC counters)"},
+	[BSC_CTR_MSCPOOL_EMERG_LOST] =		{"mscpool:emerg:lost",
+						 "Emergency call requests lost because no MSC was found available."},
 };
 
 
diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c
index 32363eb7f..3703c76aa 100644
--- a/src/osmo-bsc/gsm_08_08.c
+++ b/src/osmo-bsc/gsm_08_08.c
@@ -228,6 +228,7 @@ static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,
 			if (is_msc_usable(msc_target, is_emerg)) {
 				LOG_COMPL_L3(pdisc, mtype, LOGL_DEBUG, "%s matches earlier Paging from msc %d\n",
 					     osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), msc_target->nr);
+				rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_PAGED]);
 				return msc_target;
 			} else {
 				LOG_COMPL_L3(pdisc, mtype, LOGL_DEBUG,
@@ -268,9 +269,11 @@ static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,
 		bool nri_matches_msc = (nri_v >= 0 && osmo_nri_v_matches_ranges(nri_v, msc->nri_ranges));
 
 		if (!is_msc_usable(msc, is_emerg)) {
-			if (nri_matches_msc)
+			if (nri_matches_msc) {
 				LOG_NRI(LOGL_DEBUG, "matches msc %d, but this MSC is currently not connected\n",
 					msc->nr);
+				rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST]);
+			}
 			continue;
 		}
 
@@ -281,6 +284,11 @@ static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,
 					msc->nr);
 			} else {
 				LOG_NRI(LOGL_DEBUG, "matches msc %d\n", msc->nr);
+				rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_KNOWN]);
+				if (is_emerg) {
+					rate_ctr_inc(&msc->msc_ctrs->ctr[MSC_CTR_MSCPOOL_EMERG_FORWARDED]);
+					rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_FORWARDED]);
+				}
 				return msc;
 			}
 		}
@@ -316,12 +324,25 @@ static struct bsc_msc_data *bsc_find_msc(struct gsm_subscriber_connection *conn,
 	if (!msc_target) {
 		LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "%s%s: No suitable MSC for this Complete Layer 3 request found\n",
 			     osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), is_emerg ? " FOR EMERGENCY CALL" : "");
+		rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_SUBSCR_NO_MSC]);
+		if (is_emerg)
+			rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_LOST]);
 		return NULL;
 	}
 
 	LOGP(DMSC, LOGL_DEBUG, "New subscriber %s: MSC round-robin selects msc %d\n",
 	     osmo_mobile_identity_to_str_c(OTC_SELECT, &mi), msc_target->nr);
 
+	if (is_null_nri)
+		rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_REATTACH]);
+	else
+		rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_NEW]);
+
+	if (is_emerg) {
+		rate_ctr_inc(&msc_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_EMERG_FORWARDED]);
+		rate_ctr_inc(&bsc_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_FORWARDED]);
+	}
+
 	/* An MSC was picked by round-robin, so update the next round-robin nr to pick */
 	if (is_emerg)
 		net->mscs_round_robin_next_emerg_nr = msc_target->nr + 1;
diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c
index 157808e95..9b00ffcb4 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -100,6 +100,34 @@ static const struct rate_ctr_desc msc_ctr_description[] = {
 	[MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE] =         {"bssmap:tx:dt1:handover:complete", "Number of transmitted BSSMAP DT1 HANDOVER COMPLETE messages"},
 	[MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE] =          {"bssmap:tx:dt1:handover:failure", "Number of transmitted BSSMAP DT1 HANDOVER FAILURE messages"},
 	[MSC_CTR_BSSMAP_TX_DT1_DTAP] =                      {"bssmap:tx:dt1:dtap", "Number of transmitted BSSMAP DT1 DTAP messages"},
+
+	/* Indicators for MSC pool usage */
+	[MSC_CTR_MSCPOOL_SUBSCR_NEW] = {
+		"mscpool:subscr:new",
+		"Complete Layer 3 requests assigned to this MSC by round-robin (no NRI was assigned yet).",
+	},
+	[MSC_CTR_MSCPOOL_SUBSCR_REATTACH] = {
+		"mscpool:subscr:reattach",
+		"Complete Layer 3 requests assigned to this MSC by round-robin because the subscriber indicates a"
+		" NULL-NRI (previously assigned by another MSC).",
+	},
+	[MSC_CTR_MSCPOOL_SUBSCR_KNOWN] = {
+		"mscpool:subscr:known",
+		"Complete Layer 3 requests directed to this MSC because the subscriber indicates an NRI of this MSC.",
+	},
+	[MSC_CTR_MSCPOOL_SUBSCR_PAGED] = {
+		"mscpool:subscr:paged",
+		"Paging Response directed to this MSC because the subscriber was recently paged by this MSC.",
+	},
+	[MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST] = {
+		"mscpool:subscr:attach_lost",
+		"A subscriber indicates an NRI value matching this MSC, but the MSC is not connected:"
+		" a re-attach to another MSC (if available) was forced, with possible service failure.",
+	},
+	[MSC_CTR_MSCPOOL_EMERG_FORWARDED] = {
+		"mscpool:emerg:forwarded",
+		"Emergency call requests forwarded to this MSC.",
+	},
 };
 
 static const struct rate_ctr_group_desc msc_ctrg_desc = {