<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9942">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf: Replace '.' in counter names with ':'<br><br>The '.' is illegal character in counter names, as they are exported<br>via CTRL interface, where '.' has a special meaning that cannot be<br>used by strings comprising the variable name.<br><br>Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15<br>---<br>M src/tbf.cpp<br>1 file changed, 32 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/9942/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 76137df..71057db 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -98,49 +98,49 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc tbf_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "rlc.nacked", "RLC Nacked " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "rlc:nacked", "RLC Nacked " },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc tbf_dl_gprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.downlink.cs1", "CS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.downlink.cs2", "CS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.downlink.cs3", "CS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.downlink.cs4", "CS4 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs1", "CS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs2", "CS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs3", "CS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:downlink:cs4", "CS4 " },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc tbf_dl_egprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs1", "MCS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs2", "MCS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs3", "MCS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs4", "MCS4 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs5", "MCS5 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs6", "MCS6 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs7", "MCS7 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs8", "MCS8 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.downlink.mcs9", "MCS9 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs1", "MCS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs2", "MCS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs3", "MCS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs4", "MCS4 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs5", "MCS5 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs6", "MCS6 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs7", "MCS7 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs8", "MCS8 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:downlink:mcs9", "MCS9 " },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc tbf_ul_gprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.uplink.cs1", "CS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.uplink.cs2", "CS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.uplink.cs3", "CS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "gprs.uplink.cs4", "CS4 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink:cs1", "CS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink:cs2", "CS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink:cs3", "CS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "gprs:uplink:cs4", "CS4 " },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_desc tbf_ul_egprs_ctr_description[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs1", "MCS1 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs2", "MCS2 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs3", "MCS3 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs4", "MCS4 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs5", "MCS5 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs6", "MCS6 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs7", "MCS7 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs8", "MCS8 " },</span><br><span style="color: hsl(0, 100%, 40%);">- { "egprs.uplink.mcs9", "MCS9 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs1", "MCS1 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs2", "MCS2 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs3", "MCS3 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs4", "MCS4 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs5", "MCS5 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs6", "MCS6 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs7", "MCS7 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs8", "MCS8 " },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "egprs:uplink:mcs9", "MCS9 " },</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc tbf_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "pcu.tbf",</span><br><span style="color: hsl(120, 100%, 40%);">+ "pcu:tbf",</span><br><span> "TBF Statistics",</span><br><span> OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span> ARRAY_SIZE(tbf_ctr_description),</span><br><span>@@ -148,7 +148,7 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc tbf_dl_gprs_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "tbf.gprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "tbf:gprs",</span><br><span> "Data Blocks",</span><br><span> OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span> ARRAY_SIZE(tbf_dl_gprs_ctr_description),</span><br><span>@@ -156,7 +156,7 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc tbf_dl_egprs_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "tbf.egprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "tbf:egprs",</span><br><span> "Data Blocks",</span><br><span> OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span> ARRAY_SIZE(tbf_dl_egprs_ctr_description),</span><br><span>@@ -164,7 +164,7 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc tbf_ul_gprs_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "tbf.gprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "tbf:gprs",</span><br><span> "Data Blocks",</span><br><span> OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span> ARRAY_SIZE(tbf_ul_gprs_ctr_description),</span><br><span>@@ -172,7 +172,7 @@</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc tbf_ul_egprs_ctrg_desc = {</span><br><span style="color: hsl(0, 100%, 40%);">- "tbf.egprs",</span><br><span style="color: hsl(120, 100%, 40%);">+ "tbf:egprs",</span><br><span> "Data Blocks",</span><br><span> OSMO_STATS_CLASS_SUBSCRIBER,</span><br><span> ARRAY_SIZE(tbf_ul_egprs_ctr_description),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9942">change 9942</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9942"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ieb7496e1a30ab4f2bfe36c7b664dcdc034010a15 </div>
<div style="display:none"> Gerrit-Change-Number: 9942 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>