daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/18718 )
Change subject: osmo-bsc: Use designated initializer in bts_stat_desc
......................................................................
osmo-bsc: Use designated initializer in bts_stat_desc
Change-Id: Ic29f3a7e6fb16955bc74cc163d45a243b373183a
---
M src/osmo-bsc/gsm_data.c
1 file changed, 45 insertions(+), 24 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 46e26ac..9bf6f82 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -345,30 +345,51 @@
}
static const struct osmo_stat_item_desc bts_stat_desc[] = {
- { "chanloadavg", "Channel load average", "%", 16, 0 },
- { "chan_ccch_sdcch4:used", "Number of CCCH+SDCCH4 channels used", "",
16, 0 },
- { "chan_ccch_sdcch4:total", "Number of CCCH+SDCCH4 channels total", "",
16, 0 },
- { "chan_tch_f:used", "Number of TCH/F channels used", "", 16, 0 },
- { "chan_tch_f:total", "Number of TCH/F channels total", "", 16, 0 },
- { "chan_tch_h:used", "Number of TCH/H channels used", "", 16, 0 },
- { "chan_tch_h:total", "Number of TCH/H channels total", "", 16, 0 },
- { "chan_sdcch8:used", "Number of SDCCH8 channels used", "", 16, 0 },
- { "chan_sdcch8:total", "Number of SDCCH8 channels total", "", 16, 0 },
- { "chan_tch_f_pdch:used", "Number of TCH/F_PDCH channels used", "", 16,
0 },
- { "chan_tch_f_pdch:total", "Number of TCH/F_PDCH channels total", "",
16, 0 },
- { "chan_ccch_sdcch4_cbch:used", "Number of CCCH+SDCCH4+CBCH channels
used", "", 16, 0 },
- { "chan_ccch_sdcch4_cbch:total", "Number of CCCH+SDCCH4+CBCH channels
total", "", 16, 0 },
- { "chan_sdcch8_cbch:used", "Number of SDCCH8+CBCH channels used", "",
16, 0 },
- { "chan_sdcch8_cbch:total", "Number of SDCCH8+CBCH channels total", "",
16, 0 },
- { "chan_tch_f_tch_h_pdch:used", "Number of TCH/F_TCH/H_PDCH channels
used", "", 16, 0 },
- { "chan_tch_f_tch_h_pdch:total", "Number of TCH/F_TCH/H_PDCH channels
total", "", 16, 0 },
- { "T3122", "T3122 IMMEDIATE ASSIGNMENT REJECT wait indicator", "s", 16,
GSM_T3122_DEFAULT },
- { "rach_busy", "RACH slots with signal above threshold", "%", 16, 0 },
- { "rach_access", "RACH slots with access bursts in them", "%", 16, 0 },
- { "oml_connected", "Number of OML links connected", "", 16, 0 },
- { "rsl_connected", "Number of RSL links connected", "", 16, 0 },
- { "lchan_borken", "Number of lchans in the BORKEN state", "", 16, 0 },
- { "ts_borken", "Number of timeslots in the BORKEN state", "", 16, 0 },
+ [BTS_STAT_CHAN_LOAD_AVERAGE] = { "chanloadavg",
"Channel load average", "%", 16, 0 },
+ [BTS_STAT_CHAN_CCCH_SDCCH4_USED] = {
"chan_ccch_sdcch4:used",
+ "Number of
CCCH+SDCCH4 channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_CCCH_SDCCH4_TOTAL] = {
"chan_ccch_sdcch4:total",
+ "Number of
CCCH+SDCCH4 channels total", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_F_USED] = { "chan_tch_f:used",
+ "Number of TCH/F
channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_F_TOTAL] = { "chan_tch_f:total",
+ "Number of TCH/F
channels total", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_H_USED] = { "chan_tch_h:used",
+ "Number of TCH/H
channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_H_TOTAL] = { "chan_tch_h:total",
+ "Number of TCH/H
channels total", "", 16, 0 },
+ [BTS_STAT_CHAN_SDCCH8_USED] = { "chan_sdcch8:used",
+ "Number of SDCCH8
channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_SDCCH8_TOTAL] = { "chan_sdcch8:total",
+ "Number of SDCCH8
channels total", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_F_PDCH_USED] = {
"chan_tch_f_pdch:used",
+ "Number of TCH/F_PDCH
channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_F_PDCH_TOTAL] = {
"chan_tch_f_pdch:total",
+ "Number of TCH/F_PDCH
channels total", "", 16, 0 },
+ [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_USED] = {
"chan_ccch_sdcch4_cbch:used",
+ "Number of
CCCH+SDCCH4+CBCH channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_CCCH_SDCCH4_CBCH_TOTAL] = {
"chan_ccch_sdcch4_cbch:total",
+ "Number of
CCCH+SDCCH4+CBCH channels total", "", 16, 0 },
+ [BTS_STAT_CHAN_SDCCH8_CBCH_USED] = {
"chan_sdcch8_cbch:used",
+ "Number of
SDCCH8+CBCH channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_SDCCH8_CBCH_TOTAL] = {
"chan_sdcch8_cbch:total",
+ "Number of
SDCCH8+CBCH channels total", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_USED] = {
"chan_tch_f_tch_h_pdch:used",
+ "Number of
TCH/F_TCH/H_PDCH channels used", "", 16, 0 },
+ [BTS_STAT_CHAN_TCH_F_TCH_H_PDCH_TOTAL] = {
"chan_tch_f_tch_h_pdch:total",
+ "Number of
TCH/F_TCH/H_PDCH channels total", "", 16, 0 },
+ [BTS_STAT_T3122] = { "T3122", "T3122
IMMEDIATE ASSIGNMENT REJECT wait indicator",
+ "s", 16,
GSM_T3122_DEFAULT },
+ [BTS_STAT_RACH_BUSY] = { "rach_busy",
+ "RACH slots with
signal above threshold", "%", 16, 0 },
+ [BTS_STAT_RACH_ACCESS] = { "rach_access",
+ "RACH slots with
access bursts in them", "%", 16, 0 },
+ [BTS_STAT_OML_CONNECTED] = { "oml_connected",
"Number of OML links connected", "", 16, 0 },
+ [BTS_STAT_RSL_CONNECTED] = { "rsl_connected",
"Number of RSL links connected", "", 16, 0 },
+ [BTS_STAT_LCHAN_BORKEN] = { "lchan_borken",
+ "Number of lchans in
the BORKEN state", "", 16, 0 },
+ [BTS_STAT_TS_BORKEN] = { "ts_borken",
+ "Number of timeslots
in the BORKEN state", "", 16, 0 },
};
static const struct osmo_stat_item_group_desc bts_statg_desc = {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18718
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic29f3a7e6fb16955bc74cc163d45a243b373183a
Gerrit-Change-Number: 18718
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillm...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
