diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-10-03 17:49:21 +0800 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-10-24 16:00:45 +0000 |
| commit | a7a5065385be71239d49bb60a690402d3153eb34 (patch) | |
| tree | 8995b7a0ef5867e390ca54f51309161113d9f5ff | |
| parent | ae510dc4a743e981b40fc5e1fdb4c109f2425e27 (diff) | |
Convert lib-internal rate_ctr from '.' separator to ':' separator
The rate_ctr.c code would do this mangling automatically, but let's
avoid using this from new versions of our code for
simplicity/explicitness.
Change-Id: I24a556f447cfac25efb6e83cac2d0c2972d98fe3
| -rw-r--r-- | src/gb/gprs_bssgp.c | 10 | ||||
| -rw-r--r-- | src/gb/gprs_ns.c | 14 | ||||
| -rw-r--r-- | tests/stats/stats_test.c | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 25528490..b9066432 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -43,17 +43,17 @@ void *bssgp_tall_ctx = NULL; static const struct rate_ctr_desc bssgp_ctr_description[] = { - { "packets.in", "Packets at BSSGP Level ( In)" }, - { "packets.out","Packets at BSSGP Level (Out)" }, - { "bytes.in", "Bytes at BSSGP Level ( In)" }, - { "bytes.out", "Bytes at BSSGP Level (Out)" }, + { "packets:in", "Packets at BSSGP Level ( In)" }, + { "packets:out","Packets at BSSGP Level (Out)" }, + { "bytes:in", "Bytes at BSSGP Level ( In)" }, + { "bytes:out", "Bytes at BSSGP Level (Out)" }, { "blocked", "BVC Blocking count" }, { "discarded", "BVC LLC Discarded count" }, { "status", "BVC Status count" }, }; static const struct rate_ctr_group_desc bssgp_ctrg_desc = { - .group_name_prefix = "bssgp.bss_ctx", + .group_name_prefix = "bssgp:bss_ctx", .group_description = "BSSGP Peer Statistics", .num_ctr = ARRAY_SIZE(bssgp_ctr_description), .ctr_desc = bssgp_ctr_description, diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 18d43ccc..679b59da 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -115,22 +115,22 @@ enum ns_ctr { }; static const struct rate_ctr_desc nsvc_ctr_description[] = { - { "packets.in", "Packets at NS Level ( In)" }, - { "packets.out","Packets at NS Level (Out)" }, - { "bytes.in", "Bytes at NS Level ( In)" }, - { "bytes.out", "Bytes at NS Level (Out)" }, + { "packets:in", "Packets at NS Level ( In)" }, + { "packets:out","Packets at NS Level (Out)" }, + { "bytes:in", "Bytes at NS Level ( In)" }, + { "bytes:out", "Bytes at NS Level (Out)" }, { "blocked", "NS-VC Block count " }, { "dead", "NS-VC gone dead count " }, { "replaced", "NS-VC replaced other count" }, { "nsei-chg", "NS-VC changed NSEI count " }, { "inv-nsvci", "NS-VCI was invalid count " }, { "inv-nsei", "NSEI was invalid count " }, - { "lost.alive", "ALIVE ACK missing count " }, - { "lost.reset", "RESET ACK missing count " }, + { "lost:alive", "ALIVE ACK missing count " }, + { "lost:reset", "RESET ACK missing count " }, }; static const struct rate_ctr_group_desc nsvc_ctrg_desc = { - .group_name_prefix = "ns.nsvc", + .group_name_prefix = "ns:nsvc", .group_description = "NSVC Peer Statistics", .num_ctr = ARRAY_SIZE(nsvc_ctr_description), .ctr_desc = nsvc_ctr_description, diff --git a/tests/stats/stats_test.c b/tests/stats/stats_test.c index 02344600..61673ba8 100644 --- a/tests/stats/stats_test.c +++ b/tests/stats/stats_test.c @@ -35,12 +35,12 @@ enum test_ctr { }; static const struct rate_ctr_desc ctr_description[] = { - [TEST_A_CTR] = { "ctr.a", "The A counter value"}, - [TEST_B_CTR] = { "ctr.b", "The B counter value"}, + [TEST_A_CTR] = { "ctr:a", "The A counter value"}, + [TEST_B_CTR] = { "ctr:b", "The B counter value"}, }; static const struct rate_ctr_group_desc ctrg_desc = { - .group_name_prefix = "ctr-test.one", + .group_name_prefix = "ctr-test:one", .group_description = "Counter test number 1", .num_ctr = ARRAY_SIZE(ctr_description), .ctr_desc = ctr_description, |