move BSC level stats and rate counters to new bsc_stats.[hc]

Instead of having static const structs in header files (which end up
duplicated in each and every compile unit!), have one .c file with the
rate_ctr and stat_item descriptions.

Related: SYS#5542
Change-Id: I8fd6380b5ae8ed2d3347e7cfbf674c30b6841ed9

3 files changed, 99 insertions, 157 deletions

diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am
index dde08a138..3accc740a 100644
--- a/include/osmocom/bsc/Makefile.am
+++ b/include/osmocom/bsc/Makefile.am
@@ -7,6 +7,7 @@ noinst_HEADERS = \
 	acc.h \
 	assignment_fsm.h \
 	bsc_rll.h \
+	bsc_stats.h \
 	bsc_subscriber.h \
 	bsc_subscr_conn_fsm.h \
 	bss.h \
diff --git a/include/osmocom/bsc/bsc_stats.h b/include/osmocom/bsc/bsc_stats.h
new file mode 100644
index 000000000..8fcd5a09e
--- /dev/null
+++ b/include/osmocom/bsc/bsc_stats.h
@@ -0,0 +1,98 @@
+/* osmo-bsc statistics */
+/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <osmocom/core/rate_ctr.h>
+
+struct osmo_stat_item_group_desc;
+
+/* OsmoBSC rate_ctr indexes */
+enum {
+	BSC_CTR_ASSIGNMENT_ATTEMPTED,
+	BSC_CTR_ASSIGNMENT_COMPLETED,
+	BSC_CTR_ASSIGNMENT_STOPPED,
+	BSC_CTR_ASSIGNMENT_NO_CHANNEL,
+	BSC_CTR_ASSIGNMENT_TIMEOUT,
+	BSC_CTR_ASSIGNMENT_FAILED,
+	BSC_CTR_ASSIGNMENT_ERROR,
+	BSC_CTR_HANDOVER_ATTEMPTED,
+	BSC_CTR_HANDOVER_COMPLETED,
+	BSC_CTR_HANDOVER_STOPPED,
+	BSC_CTR_HANDOVER_NO_CHANNEL,
+	BSC_CTR_HANDOVER_TIMEOUT,
+	BSC_CTR_HANDOVER_FAILED,
+	BSC_CTR_HANDOVER_ERROR,
+	BSC_CTR_INTRA_CELL_HO_ATTEMPTED,
+	BSC_CTR_INTRA_CELL_HO_COMPLETED,
+	BSC_CTR_INTRA_CELL_HO_STOPPED,
+	BSC_CTR_INTRA_CELL_HO_NO_CHANNEL,
+	BSC_CTR_INTRA_CELL_HO_TIMEOUT,
+	BSC_CTR_INTRA_CELL_HO_FAILED,
+	BSC_CTR_INTRA_CELL_HO_ERROR,
+	BSC_CTR_INTRA_BSC_HO_ATTEMPTED,
+	BSC_CTR_INTRA_BSC_HO_COMPLETED,
+	BSC_CTR_INTRA_BSC_HO_STOPPED,
+	BSC_CTR_INTRA_BSC_HO_NO_CHANNEL,
+	BSC_CTR_INTRA_BSC_HO_TIMEOUT,
+	BSC_CTR_INTRA_BSC_HO_FAILED,
+	BSC_CTR_INTRA_BSC_HO_ERROR,
+	BSC_CTR_INTER_BSC_HO_OUT_ATTEMPTED,
+	BSC_CTR_INTER_BSC_HO_OUT_COMPLETED,
+	BSC_CTR_INTER_BSC_HO_OUT_STOPPED,
+	BSC_CTR_INTER_BSC_HO_OUT_TIMEOUT,
+	BSC_CTR_INTER_BSC_HO_OUT_FAILED,
+	BSC_CTR_INTER_BSC_HO_OUT_ERROR,
+	BSC_CTR_INTER_BSC_HO_IN_ATTEMPTED,
+	BSC_CTR_INTER_BSC_HO_IN_COMPLETED,
+	BSC_CTR_INTER_BSC_HO_IN_STOPPED,
+	BSC_CTR_INTER_BSC_HO_IN_NO_CHANNEL,
+	BSC_CTR_INTER_BSC_HO_IN_FAILED,
+	BSC_CTR_INTER_BSC_HO_IN_TIMEOUT,
+	BSC_CTR_INTER_BSC_HO_IN_ERROR,
+	BSC_CTR_SRVCC_ATTEMPTED,
+	BSC_CTR_SRVCC_COMPLETED,
+	BSC_CTR_SRVCC_STOPPED,
+	BSC_CTR_SRVCC_NO_CHANNEL,
+	BSC_CTR_SRVCC_TIMEOUT,
+	BSC_CTR_SRVCC_FAILED,
+	BSC_CTR_SRVCC_ERROR,
+	BSC_CTR_PAGING_ATTEMPTED,
+	BSC_CTR_PAGING_DETACHED,
+	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,
+};
+
+extern const struct rate_ctr_desc bsc_ctr_description[];
+extern const struct rate_ctr_group_desc bsc_ctrg_desc;
+
+/* OsmoBSC stat_item indexes */
+enum {
+	BSC_STAT_NUM_BTS_TOTAL,
+};
+
+/* BTS counter index if a BTS could not be found
+ * Currently we are limited to bts 0 - 255 in the VTY, but that might change in
+ * the future so use 2**16 */
+#define BTS_STAT_IDX_UNKNOWN (UINT16_MAX + 1)
+
+extern const struct osmo_stat_item_group_desc bsc_statg_desc;
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index d6c06de3d..db0f2497f 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1110,163 +1110,6 @@ struct gsm_bts *conn_get_bts(struct gsm_subscriber_connection *conn);
 void conn_update_ms_power_class(struct gsm_subscriber_connection *conn, uint8_t power_class);
 void lchan_update_ms_power_ctrl_level(struct gsm_lchan *lchan, int ms_power_dbm);
 
-enum {
-	BSC_CTR_ASSIGNMENT_ATTEMPTED,
-	BSC_CTR_ASSIGNMENT_COMPLETED,
-	BSC_CTR_ASSIGNMENT_STOPPED,
-	BSC_CTR_ASSIGNMENT_NO_CHANNEL,
-	BSC_CTR_ASSIGNMENT_TIMEOUT,
-	BSC_CTR_ASSIGNMENT_FAILED,
-	BSC_CTR_ASSIGNMENT_ERROR,
-	BSC_CTR_HANDOVER_ATTEMPTED,
-	BSC_CTR_HANDOVER_COMPLETED,
-	BSC_CTR_HANDOVER_STOPPED,
-	BSC_CTR_HANDOVER_NO_CHANNEL,
-	BSC_CTR_HANDOVER_TIMEOUT,
-	BSC_CTR_HANDOVER_FAILED,
-	BSC_CTR_HANDOVER_ERROR,
-	BSC_CTR_INTRA_CELL_HO_ATTEMPTED,
-	BSC_CTR_INTRA_CELL_HO_COMPLETED,
-	BSC_CTR_INTRA_CELL_HO_STOPPED,
-	BSC_CTR_INTRA_CELL_HO_NO_CHANNEL,
-	BSC_CTR_INTRA_CELL_HO_TIMEOUT,
-	BSC_CTR_INTRA_CELL_HO_FAILED,
-	BSC_CTR_INTRA_CELL_HO_ERROR,
-	BSC_CTR_INTRA_BSC_HO_ATTEMPTED,
-	BSC_CTR_INTRA_BSC_HO_COMPLETED,
-	BSC_CTR_INTRA_BSC_HO_STOPPED,
-	BSC_CTR_INTRA_BSC_HO_NO_CHANNEL,
-	BSC_CTR_INTRA_BSC_HO_TIMEOUT,
-	BSC_CTR_INTRA_BSC_HO_FAILED,
-	BSC_CTR_INTRA_BSC_HO_ERROR,
-	BSC_CTR_INTER_BSC_HO_OUT_ATTEMPTED,
-	BSC_CTR_INTER_BSC_HO_OUT_COMPLETED,
-	BSC_CTR_INTER_BSC_HO_OUT_STOPPED,
-	BSC_CTR_INTER_BSC_HO_OUT_TIMEOUT,
-	BSC_CTR_INTER_BSC_HO_OUT_FAILED,
-	BSC_CTR_INTER_BSC_HO_OUT_ERROR,
-	BSC_CTR_INTER_BSC_HO_IN_ATTEMPTED,
-	BSC_CTR_INTER_BSC_HO_IN_COMPLETED,
-	BSC_CTR_INTER_BSC_HO_IN_STOPPED,
-	BSC_CTR_INTER_BSC_HO_IN_NO_CHANNEL,
-	BSC_CTR_INTER_BSC_HO_IN_FAILED,
-	BSC_CTR_INTER_BSC_HO_IN_TIMEOUT,
-	BSC_CTR_INTER_BSC_HO_IN_ERROR,
-	BSC_CTR_SRVCC_ATTEMPTED,
-	BSC_CTR_SRVCC_COMPLETED,
-	BSC_CTR_SRVCC_STOPPED,
-	BSC_CTR_SRVCC_NO_CHANNEL,
-	BSC_CTR_SRVCC_TIMEOUT,
-	BSC_CTR_SRVCC_FAILED,
-	BSC_CTR_SRVCC_ERROR,
-	BSC_CTR_PAGING_ATTEMPTED,
-	BSC_CTR_PAGING_DETACHED,
-	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[] = {
-	[BSC_CTR_ASSIGNMENT_ATTEMPTED] =	{"assignment:attempted", "Assignment attempts"},
-	[BSC_CTR_ASSIGNMENT_COMPLETED] =	{"assignment:completed", "Assignment completed"},
-	[BSC_CTR_ASSIGNMENT_STOPPED] = 		{"assignment:stopped", "Connection ended during Assignment"},
-	[BSC_CTR_ASSIGNMENT_NO_CHANNEL] = 	{"assignment:no_channel", "Failure to allocate lchan for Assignment"},
-	[BSC_CTR_ASSIGNMENT_TIMEOUT] = 		{"assignment:timeout", "Assignment timed out"},
-	[BSC_CTR_ASSIGNMENT_FAILED] = 		{"assignment:failed", "Received Assignment Failure message"},
-	[BSC_CTR_ASSIGNMENT_ERROR] = 		{"assignment:error", "Assignment failed for other reason"},
-
-	[BSC_CTR_HANDOVER_ATTEMPTED] = 		{"handover:attempted", "Intra-BSC handover attempts"},
-	[BSC_CTR_HANDOVER_COMPLETED] = 		{"handover:completed", "Intra-BSC handover completed"},
-	[BSC_CTR_HANDOVER_STOPPED] = 		{"handover:stopped", "Connection ended during HO"},
-	[BSC_CTR_HANDOVER_NO_CHANNEL] = 	{"handover:no_channel", "Failure to allocate lchan for HO"},
-	[BSC_CTR_HANDOVER_TIMEOUT] = 		{"handover:timeout", "Handover timed out"},
-	[BSC_CTR_HANDOVER_FAILED] = 		{"handover:failed", "Received Handover Fail messages"},
-	[BSC_CTR_HANDOVER_ERROR] = 		{"handover:error", "Re-assignment failed for other reason"},
-
-	[BSC_CTR_INTRA_CELL_HO_ATTEMPTED] = 	{"intra_cell_ho:attempted", "Intra-Cell handover attempts"},
-	[BSC_CTR_INTRA_CELL_HO_COMPLETED] = 	{"intra_cell_ho:completed", "Intra-Cell handover completed"},
-	[BSC_CTR_INTRA_CELL_HO_STOPPED] = 	{"intra_cell_ho:stopped", "Connection ended during HO"},
-	[BSC_CTR_INTRA_CELL_HO_NO_CHANNEL] = 	{"intra_cell_ho:no_channel", "Failure to allocate lchan for HO"},
-	[BSC_CTR_INTRA_CELL_HO_TIMEOUT] = 	{"intra_cell_ho:timeout", "Handover timed out"},
-	[BSC_CTR_INTRA_CELL_HO_FAILED] = 	{"intra_cell_ho:failed", "Received Handover Fail messages"},
-	[BSC_CTR_INTRA_CELL_HO_ERROR] = 	{"intra_cell_ho:error", "Re-assignment failed for other reason"},
-
-	[BSC_CTR_INTRA_BSC_HO_ATTEMPTED] = 	{"intra_bsc_ho:attempted", "Intra-BSC handover attempts"},
-	[BSC_CTR_INTRA_BSC_HO_COMPLETED] = 	{"intra_bsc_ho:completed", "Intra-BSC handover completed"},
-	[BSC_CTR_INTRA_BSC_HO_STOPPED] = 	{"intra_bsc_ho:stopped", "Connection ended during HO"},
-	[BSC_CTR_INTRA_BSC_HO_NO_CHANNEL] = 	{"intra_bsc_ho:no_channel", "Failure to allocate lchan for HO"},
-	[BSC_CTR_INTRA_BSC_HO_TIMEOUT] = 	{"intra_bsc_ho:timeout", "Handover timed out"},
-	[BSC_CTR_INTRA_BSC_HO_FAILED] = 	{"intra_bsc_ho:failed", "Received Handover Fail messages"},
-	[BSC_CTR_INTRA_BSC_HO_ERROR] = 		{"intra_bsc_ho:error", "Re-assignment failed for other reason"},
-
-	[BSC_CTR_INTER_BSC_HO_OUT_ATTEMPTED] =	{"interbsc_ho_out:attempted",
-						 "Attempts to handover to remote BSS"},
-	[BSC_CTR_INTER_BSC_HO_OUT_COMPLETED] =	{"interbsc_ho_out:completed",
-						 "Handover to remote BSS completed"},
-	[BSC_CTR_INTER_BSC_HO_OUT_STOPPED] =	{"interbsc_ho_out:stopped", "Connection ended during HO"},
-	[BSC_CTR_INTER_BSC_HO_OUT_TIMEOUT] =	{"interbsc_ho_out:timeout", "Handover timed out"},
-	[BSC_CTR_INTER_BSC_HO_OUT_FAILED] =	{"interbsc_ho_out:failed", "Received Handover Fail message"},
-	[BSC_CTR_INTER_BSC_HO_OUT_ERROR] =	{"interbsc_ho_out:error",
-						 "Handover to remote BSS failed for other reason"},
-
-	[BSC_CTR_INTER_BSC_HO_IN_ATTEMPTED] =	{"interbsc_ho_in:attempted",
-						 "Attempts to handover from remote BSS"},
-	[BSC_CTR_INTER_BSC_HO_IN_COMPLETED] =	{"interbsc_ho_in:completed",
-						 "Handover from remote BSS completed"},
-	[BSC_CTR_INTER_BSC_HO_IN_STOPPED] =	{"interbsc_ho_in:stopped", "Connection ended during HO"},
-	[BSC_CTR_INTER_BSC_HO_IN_NO_CHANNEL] =	{"interbsc_ho_in:no_channel",
-						 "Failure to allocate lchan for HO"},
-	[BSC_CTR_INTER_BSC_HO_IN_TIMEOUT] =	{"interbsc_ho_in:timeout", "Handover from remote BSS timed out"},
-	[BSC_CTR_INTER_BSC_HO_IN_FAILED] =	{"interbsc_ho_in:failed", "Received Handover Fail message"},
-	[BSC_CTR_INTER_BSC_HO_IN_ERROR] =	{"interbsc_ho_in:error",
-						 "Handover from remote BSS failed for other reason"},
-
-	[BSC_CTR_SRVCC_ATTEMPTED] =             {"srvcc:attempted", "Intra-BSC SRVCC attempts"},
-	[BSC_CTR_SRVCC_COMPLETED] =             {"srvcc:completed", "Intra-BSC SRVCC completed"},
-	[BSC_CTR_SRVCC_STOPPED] =               {"srvcc:stopped", "Connection ended during HO"},
-	[BSC_CTR_SRVCC_NO_CHANNEL] =            {"srvcc:no_channel", "Failure to allocate lchan for HO"},
-	[BSC_CTR_SRVCC_TIMEOUT] =               {"srvcc:timeout", "SRVCC timed out"},
-	[BSC_CTR_SRVCC_FAILED] =                {"srvcc:failed", "Received SRVCC Fail messages"},
-	[BSC_CTR_SRVCC_ERROR] =                 {"srvcc:error", "Re-assignment failed for other reason"},
-
-	[BSC_CTR_PAGING_ATTEMPTED] = 		{"paging:attempted", "Paging attempts for a subscriber"},
-	[BSC_CTR_PAGING_DETACHED] = 		{"paging:detached", "Paging request send failures because no responsible BTS was found"},
-	[BSC_CTR_PAGING_RESPONDED] = 		{"paging:responded", "Paging attempts with successful response"},
-	[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"},
-};
-
-
-
-static const struct rate_ctr_group_desc bsc_ctrg_desc = {
-	"bsc",
-	"base station controller",
-	OSMO_STATS_CLASS_GLOBAL,
-	ARRAY_SIZE(bsc_ctr_description),
-	bsc_ctr_description,
-};
-
-/* Constants for the BSC stats */
-enum {
-	BSC_STAT_NUM_BTS_TOTAL,
-};
-
-/* BTS counter index if a BTS could not be found
- * Currently we are limited to bts 0 - 255 in the VTY, but that might change in
- * the future so use 2**16 */
-#define BTS_STAT_IDX_UNKNOWN (UINT16_MAX + 1)
-
 struct gsm_tz {
 	int override; /* if 0, use system's time zone instead. */
 	int hr; /* hour */