From a5eb67d91c88514036b6926b845229eb279827b5 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Nov 2017 20:24:54 +0100 Subject: Replace '.' in counter names with ':' The '.' is an 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: I5ef60152a31dea25cb839c47edc93d5337ec3a3e --- src/bts.cpp | 170 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 6bdbb859..c3231011 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -67,91 +67,91 @@ static BTS s_bts; * the code below. */ static const struct rate_ctr_desc bts_ctr_description[] = { - { "tbf.dl.alloc", "TBF DL Allocated "}, - { "tbf.dl.freed", "TBF DL Freed "}, - { "tbf.dl.aborted", "TBF DL Aborted "}, - { "tbf.ul.alloc", "TBF UL Allocated "}, - { "tbf.ul.freed", "TBF UL Freed "}, - { "tbf.ul.aborted", "TBF UL Aborted "}, - { "tbf.reused", "TBF Reused "}, - { "tbf.alloc.algo-a", "TBF Alloc Algo A "}, - { "tbf.alloc.algo-b", "TBF Alloc Algo B "}, - { "tbf.failed.egprs-only", "TBF Failed EGPRS-only"}, - { "rlc.sent", "RLC Sent "}, - { "rlc.resent", "RLC Resent "}, - { "rlc.restarted", "RLC Restarted "}, - { "rlc.stalled", "RLC Stalled "}, - { "rlc.nacked", "RLC Nacked "}, - { "rlc.final_block_resent", "RLC Final Blk resent "}, - { "rlc.ass.timedout", "RLC Assign Timeout "}, - { "rlc.ass.failed", "RLC Assign Failed "}, - { "rlc.ack.timedout", "RLC Ack Timeout "}, - { "rlc.ack.failed", "RLC Ack Failed "}, - { "rlc.rel.timedout", "RLC Release Timeout "}, - { "rlc.late-block", "RLC Late Block "}, - { "rlc.sent-dummy", "RLC Sent Dummy "}, - { "rlc.sent-control", "RLC Sent Control "}, - { "rlc.dl_bytes", "RLC DL Bytes "}, - { "rlc.dl_payload_bytes", "RLC DL Payload Bytes "}, - { "rlc.ul_bytes", "RLC UL Bytes "}, - { "rlc.ul_payload_bytes", "RLC UL Payload Bytes "}, - { "decode.errors", "Decode Errors "}, - { "sba.allocated", "SBA Allocated "}, - { "sba.freed", "SBA Freed "}, - { "sba.timedout", "SBA Timeout "}, - { "llc.timeout", "Timedout Frames "}, - { "llc.dropped", "Dropped Frames "}, - { "llc.scheduled", "Scheduled Frames "}, - { "llc.dl_bytes", "RLC encapsulated PDUs"}, - { "llc.ul_bytes", "full PDUs received "}, - { "rach.requests", "RACH requests "}, - { "11bit_rach.requests", "11BIT_RACH requests "}, - { "spb.uplink_first_segment", "First seg of UL SPB "}, - { "spb.uplink_second_segment", "Second seg of UL SPB "}, - { "spb.downlink_first_segment", "First seg of DL SPB "}, - { "spb.downlink_second_segment","Second seg of DL SPB "}, - { "immediate.assignment_UL", "Immediate Assign UL "}, - { "immediate.assignment_rej", "Immediate Assign Rej "}, - { "immediate.assignment_DL", "Immediate Assign DL "}, - { "channel.request_description","Channel Request Desc "}, - { "pkt.ul_assignment", "Packet UL Assignment "}, - { "pkt.access_reject", "Packet Access Reject "}, - { "pkt.dl_assignment", "Packet DL Assignment "}, - { "ul.control", "UL control Block "}, - { "ul.assignment_poll_timeout", "UL Assign Timeout "}, - { "ul.assignment_failed", "UL Assign Failed "}, - { "dl.assignment_timeout", "DL Assign Timeout "}, - { "dl.assignment_failed", "DL Assign Failed "}, - { "pkt.ul_ack_nack_timeout", "PUAN Poll Timeout "}, - { "pkt.ul_ack_nack_failed", "PUAN poll Failed "}, - { "pkt.dl_ack_nack_timeout", "PDAN poll Timeout "}, - { "pkt.dl_ack_nack_failed", "PDAN poll Failed "}, - { "gprs.downlink_cs1", "CS1 downlink "}, - { "gprs.downlink_cs2", "CS2 downlink "}, - { "gprs.downlink_cs3", "CS3 downlink "}, - { "gprs.downlink_cs4", "CS4 downlink "}, - { "egprs.downlink_mcs1", "MCS1 downlink "}, - { "egprs.downlink_mcs2", "MCS2 downlink "}, - { "egprs.downlink_mcs3", "MCS3 downlink "}, - { "egprs.downlink_mcs4", "MCS4 downlink "}, - { "egprs.downlink_mcs5", "MCS5 downlink "}, - { "egprs.downlink_mcs6", "MCS6 downlink "}, - { "egprs.downlink_mcs7", "MCS7 downlink "}, - { "egprs.downlink_mcs8", "MCS8 downlink "}, - { "egprs.downlink_mcs9", "MCS9 downlink "}, - { "gprs.uplink_cs1", "CS1 Uplink "}, - { "gprs.uplink_cs2", "CS2 Uplink "}, - { "gprs.uplink_cs3", "CS3 Uplink "}, - { "gprs.uplink_cs4", "CS4 Uplink "}, - { "egprs.uplink_mcs1", "MCS1 Uplink "}, - { "egprs.uplink_mcs2", "MCS2 Uplink "}, - { "egprs.uplink_mcs3", "MCS3 Uplink "}, - { "egprs.uplink_mcs4", "MCS4 Uplink "}, - { "egprs.uplink_mcs5", "MCS5 Uplink "}, - { "egprs.uplink_mcs6", "MCS6 Uplink "}, - { "egprs.uplink_mcs7", "MCS7 Uplink "}, - { "egprs.uplink_mcs8", "MCS8 Uplink "}, - { "egprs.uplink_mcs9", "MCS9 Uplink "}, + { "tbf:dl:alloc", "TBF DL Allocated "}, + { "tbf:dl:freed", "TBF DL Freed "}, + { "tbf:dl:aborted", "TBF DL Aborted "}, + { "tbf:ul:alloc", "TBF UL Allocated "}, + { "tbf:ul:freed", "TBF UL Freed "}, + { "tbf:ul:aborted", "TBF UL Aborted "}, + { "tbf:reused", "TBF Reused "}, + { "tbf:alloc:algo-a", "TBF Alloc Algo A "}, + { "tbf:alloc:algo-b", "TBF Alloc Algo B "}, + { "tbf:failed:egprs-only", "TBF Failed EGPRS-only"}, + { "rlc:sent", "RLC Sent "}, + { "rlc:resent", "RLC Resent "}, + { "rlc:restarted", "RLC Restarted "}, + { "rlc:stalled", "RLC Stalled "}, + { "rlc:nacked", "RLC Nacked "}, + { "rlc:final_block_resent", "RLC Final Blk resent "}, + { "rlc:ass:timedout", "RLC Assign Timeout "}, + { "rlc:ass:failed", "RLC Assign Failed "}, + { "rlc:ack:timedout", "RLC Ack Timeout "}, + { "rlc:ack:failed", "RLC Ack Failed "}, + { "rlc:rel:timedout", "RLC Release Timeout "}, + { "rlc:late-block", "RLC Late Block "}, + { "rlc:sent-dummy", "RLC Sent Dummy "}, + { "rlc:sent-control", "RLC Sent Control "}, + { "rlc:dl_bytes", "RLC DL Bytes "}, + { "rlc:dl_payload_bytes", "RLC DL Payload Bytes "}, + { "rlc:ul_bytes", "RLC UL Bytes "}, + { "rlc:ul_payload_bytes", "RLC UL Payload Bytes "}, + { "decode:errors", "Decode Errors "}, + { "sba:allocated", "SBA Allocated "}, + { "sba:freed", "SBA Freed "}, + { "sba:timedout", "SBA Timeout "}, + { "llc:timeout", "Timedout Frames "}, + { "llc:dropped", "Dropped Frames "}, + { "llc:scheduled", "Scheduled Frames "}, + { "llc:dl_bytes", "RLC encapsulated PDUs"}, + { "llc:ul_bytes", "full PDUs received "}, + { "rach:requests", "RACH requests "}, + { "11bit_rach:requests", "11BIT_RACH requests "}, + { "spb:uplink_first_segment", "First seg of UL SPB "}, + { "spb:uplink_second_segment", "Second seg of UL SPB "}, + { "spb:downlink_first_segment", "First seg of DL SPB "}, + { "spb:downlink_second_segment","Second seg of DL SPB "}, + { "immediate:assignment_UL", "Immediate Assign UL "}, + { "immediate:assignment_rej", "Immediate Assign Rej "}, + { "immediate:assignment_DL", "Immediate Assign DL "}, + { "channel:request_description","Channel Request Desc "}, + { "pkt:ul_assignment", "Packet UL Assignment "}, + { "pkt:access_reject", "Packet Access Reject "}, + { "pkt:dl_assignment", "Packet DL Assignment "}, + { "ul:control", "UL control Block "}, + { "ul:assignment_poll_timeout", "UL Assign Timeout "}, + { "ul:assignment_failed", "UL Assign Failed "}, + { "dl:assignment_timeout", "DL Assign Timeout "}, + { "dl:assignment_failed", "DL Assign Failed "}, + { "pkt:ul_ack_nack_timeout", "PUAN Poll Timeout "}, + { "pkt:ul_ack_nack_failed", "PUAN poll Failed "}, + { "pkt:dl_ack_nack_timeout", "PDAN poll Timeout "}, + { "pkt:dl_ack_nack_failed", "PDAN poll Failed "}, + { "gprs:downlink_cs1", "CS1 downlink "}, + { "gprs:downlink_cs2", "CS2 downlink "}, + { "gprs:downlink_cs3", "CS3 downlink "}, + { "gprs:downlink_cs4", "CS4 downlink "}, + { "egprs:downlink_mcs1", "MCS1 downlink "}, + { "egprs:downlink_mcs2", "MCS2 downlink "}, + { "egprs:downlink_mcs3", "MCS3 downlink "}, + { "egprs:downlink_mcs4", "MCS4 downlink "}, + { "egprs:downlink_mcs5", "MCS5 downlink "}, + { "egprs:downlink_mcs6", "MCS6 downlink "}, + { "egprs:downlink_mcs7", "MCS7 downlink "}, + { "egprs:downlink_mcs8", "MCS8 downlink "}, + { "egprs:downlink_mcs9", "MCS9 downlink "}, + { "gprs:uplink_cs1", "CS1 Uplink "}, + { "gprs:uplink_cs2", "CS2 Uplink "}, + { "gprs:uplink_cs3", "CS3 Uplink "}, + { "gprs:uplink_cs4", "CS4 Uplink "}, + { "egprs:uplink_mcs1", "MCS1 Uplink "}, + { "egprs:uplink_mcs2", "MCS2 Uplink "}, + { "egprs:uplink_mcs3", "MCS3 Uplink "}, + { "egprs:uplink_mcs4", "MCS4 Uplink "}, + { "egprs:uplink_mcs5", "MCS5 Uplink "}, + { "egprs:uplink_mcs6", "MCS6 Uplink "}, + { "egprs:uplink_mcs7", "MCS7 Uplink "}, + { "egprs:uplink_mcs8", "MCS8 Uplink "}, + { "egprs:uplink_mcs9", "MCS9 Uplink "}, }; static const struct rate_ctr_group_desc bts_ctrg_desc = { -- cgit v1.2.3