Change in osmo-pcu[master]: tbf: Replace '.' in counter names with ':'
Pau Espin Pedrol has submitted this change and it was merged. (
https://gerrit.osmocom.org/9942 )
Change subject: tbf: Replace '.' in counter names with ':'
..
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
---
M src/tbf.cpp
1 file changed, 32 insertions(+), 32 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
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 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_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
Change in osmo-pcu[master]: tbf: Replace '.' in counter names with ':'
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9942 ) Change subject: tbf: Replace '.' in counter names with ':' .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/9942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15 Gerrit-Change-Number: 9942 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 11 Jul 2018 20:17:25 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-pcu[master]: tbf: Replace '.' in counter names with ':'
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9942 ) Change subject: tbf: Replace '.' in counter names with ':' .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15 Gerrit-Change-Number: 9942 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Wed, 11 Jul 2018 20:10:47 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-pcu[master]: tbf: Replace '.' in counter names with ':'
Pau Espin Pedrol has posted comments on this change. ( https://gerrit.osmocom.org/9942 ) Change subject: tbf: Replace '.' in counter names with ':' .. Patch Set 1: Build failure triggered is fixed in next commit, so this one we can Verify+2 manually and merge. -- To view, visit https://gerrit.osmocom.org/9942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15 Gerrit-Change-Number: 9942 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Comment-Date: Tue, 10 Jul 2018 14:08:40 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-pcu[master]: tbf: Replace '.' in counter names with ':'
Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/9942
Change subject: tbf: Replace '.' in counter names with ':'
..
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
---
M src/tbf.cpp
1 file changed, 32 insertions(+), 32 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/9942/1
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 76137df..71057db 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -98,49 +98,49 @@
};
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),
@@ -148,7 +148,7 @@
};
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),
@@ -156,7 +156,7 @@
};
static const struct rate_ctr_group_desc
