aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-07-10 15:16:49 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-07-11 22:20:31 +0200
commit218ee98de0eb1e9cf36c62b87120fa5c470acdcd (patch)
treec65f234c286f97dff25b61daac77fc828691d3da
parent09269017d38d10f35dfb9a737b7b98258db3df43 (diff)
tbf: Replace '.' in counter names with ':'
The '.' is illegal character in counter names, as they are exported via CTRL interface, where '.' has a special meaning that cannot be used by strings comprising the variable name. Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15
-rw-r--r--src/tbf.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 4b89a43..6792d08 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -100,49 +100,49 @@ static const struct value_string tbf_timers_names[] = {
};
static const struct rate_ctr_desc tbf_ctr_description[] = {
- { "rlc.nacked", "RLC Nacked " },
+ { "rlc:nacked", "RLC Nacked " },
};
static const struct rate_ctr_desc tbf_dl_gprs_ctr_description[] = {
- { "gprs.downlink.cs1", "CS1 " },
- { "gprs.downlink.cs2", "CS2 " },
- { "gprs.downlink.cs3", "CS3 " },
- { "gprs.downlink.cs4", "CS4 " },
+ { "gprs:downlink:cs1", "CS1 " },
+ { "gprs:downlink:cs2", "CS2 " },
+ { "gprs:downlink:cs3", "CS3 " },
+ { "gprs:downlink:cs4", "CS4 " },
};
static const struct rate_ctr_desc tbf_dl_egprs_ctr_description[] = {
- { "egprs.downlink.mcs1", "MCS1 " },
- { "egprs.downlink.mcs2", "MCS2 " },
- { "egprs.downlink.mcs3", "MCS3 " },
- { "egprs.downlink.mcs4", "MCS4 " },
- { "egprs.downlink.mcs5", "MCS5 " },
- { "egprs.downlink.mcs6", "MCS6 " },
- { "egprs.downlink.mcs7", "MCS7 " },
- { "egprs.downlink.mcs8", "MCS8 " },
- { "egprs.downlink.mcs9", "MCS9 " },
+ { "egprs:downlink:mcs1", "MCS1 " },
+ { "egprs:downlink:mcs2", "MCS2 " },
+ { "egprs:downlink:mcs3", "MCS3 " },
+ { "egprs:downlink:mcs4", "MCS4 " },
+ { "egprs:downlink:mcs5", "MCS5 " },
+ { "egprs:downlink:mcs6", "MCS6 " },
+ { "egprs:downlink:mcs7", "MCS7 " },
+ { "egprs:downlink:mcs8", "MCS8 " },
+ { "egprs:downlink:mcs9", "MCS9 " },
};
static const struct rate_ctr_desc tbf_ul_gprs_ctr_description[] = {
- { "gprs.uplink.cs1", "CS1 " },
- { "gprs.uplink.cs2", "CS2 " },
- { "gprs.uplink.cs3", "CS3 " },
- { "gprs.uplink.cs4", "CS4 " },
+ { "gprs:uplink:cs1", "CS1 " },
+ { "gprs:uplink:cs2", "CS2 " },
+ { "gprs:uplink:cs3", "CS3 " },
+ { "gprs:uplink:cs4", "CS4 " },
};
static const struct rate_ctr_desc tbf_ul_egprs_ctr_description[] = {
- { "egprs.uplink.mcs1", "MCS1 " },
- { "egprs.uplink.mcs2", "MCS2 " },
- { "egprs.uplink.mcs3", "MCS3 " },
- { "egprs.uplink.mcs4", "MCS4 " },
- { "egprs.uplink.mcs5", "MCS5 " },
- { "egprs.uplink.mcs6", "MCS6 " },
- { "egprs.uplink.mcs7", "MCS7 " },
- { "egprs.uplink.mcs8", "MCS8 " },
- { "egprs.uplink.mcs9", "MCS9 " },
+ { "egprs:uplink:mcs1", "MCS1 " },
+ { "egprs:uplink:mcs2", "MCS2 " },
+ { "egprs:uplink:mcs3", "MCS3 " },
+ { "egprs:uplink:mcs4", "MCS4 " },
+ { "egprs:uplink:mcs5", "MCS5 " },
+ { "egprs:uplink:mcs6", "MCS6 " },
+ { "egprs:uplink:mcs7", "MCS7 " },
+ { "egprs:uplink:mcs8", "MCS8 " },
+ { "egprs:uplink:mcs9", "MCS9 " },
};
static const struct rate_ctr_group_desc tbf_ctrg_desc = {
- "pcu.tbf",
+ "pcu:tbf",
"TBF Statistics",
OSMO_STATS_CLASS_SUBSCRIBER,
ARRAY_SIZE(tbf_ctr_description),
@@ -150,7 +150,7 @@ static const struct rate_ctr_group_desc tbf_ctrg_desc = {
};
static const struct rate_ctr_group_desc tbf_dl_gprs_ctrg_desc = {
- "tbf.gprs",
+ "tbf:gprs",
"Data Blocks",
OSMO_STATS_CLASS_SUBSCRIBER,
ARRAY_SIZE(tbf_dl_gprs_ctr_description),
@@ -158,7 +158,7 @@ static const struct rate_ctr_group_desc tbf_dl_gprs_ctrg_desc = {
};
static const struct rate_ctr_group_desc tbf_dl_egprs_ctrg_desc = {
- "tbf.egprs",
+ "tbf:egprs",
"Data Blocks",
OSMO_STATS_CLASS_SUBSCRIBER,
ARRAY_SIZE(tbf_dl_egprs_ctr_description),
@@ -166,7 +166,7 @@ static const struct rate_ctr_group_desc tbf_dl_egprs_ctrg_desc = {
};
static const struct rate_ctr_group_desc tbf_ul_gprs_ctrg_desc = {
- "tbf.gprs",
+ "tbf:gprs",
"Data Blocks",
OSMO_STATS_CLASS_SUBSCRIBER,
ARRAY_SIZE(tbf_ul_gprs_ctr_description),
@@ -174,7 +174,7 @@ static const struct rate_ctr_group_desc tbf_ul_gprs_ctrg_desc = {
};
static const struct rate_ctr_group_desc tbf_ul_egprs_ctrg_desc = {
- "tbf.egprs",
+ "tbf:egprs",
"Data Blocks",
OSMO_STATS_CLASS_SUBSCRIBER,
ARRAY_SIZE(tbf_ul_egprs_ctr_description),