[PATCH 1/5] stats: Move statsd related code into a separate file
This commit moves the stats specific code parts into stats_statsd.c while keeping the generic parts in stats.c. The code in stats.c no longer contains references to statsd symbols. Note that the VTY code still needs to know about every stats reporter backend. Sponsored-by: On-Waves ehf --- include/osmocom/core/stats.h | 16 +++-- src/Makefile.am | 2 +- src/stats.c | 148 +++------------------------------------- src/stats_statsd.c | 158 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+), 144 deletions(-) create mode 100644 src/stats_statsd.c diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h index 39eae08..96f687e 100644 --- a/include/osmocom/core/stats.h +++ b/include/osmocom/core/stats.h @@ -38,8 +38,8 @@ enum osmo_stats_class { }; enum osmo_stats_reporter_type { - OSMO_STATS_REPORTER_STATSD, OSMO_STATS_REPORTER_LOG, + OSMO_STATS_REPORTER_STATSD, }; struct osmo_stats_reporter { @@ -96,9 +96,6 @@ struct osmo_stats_reporter *osmo_stats_reporter_alloc(enum osmo_stats_reporter_t const char *name); void osmo_stats_reporter_free(struct osmo_stats_reporter *srep); -struct osmo_stats_reporter *osmo_stats_reporter_create_statsd(const char *name); -struct osmo_stats_reporter *osmo_stats_reporter_create_log(const char *name); - struct osmo_stats_reporter *osmo_stats_reporter_find(enum osmo_stats_reporter_type type, const char *name); @@ -111,3 +108,14 @@ int osmo_stats_reporter_set_max_class(struct osmo_stats_reporter *srep, int osmo_stats_reporter_set_name_prefix(struct osmo_stats_reporter *srep, const char *prefix); int osmo_stats_reporter_enable(struct osmo_stats_reporter *srep); int osmo_stats_reporter_disable(struct osmo_stats_reporter *srep); + +/* reporter creation */ +struct osmo_stats_reporter *osmo_stats_reporter_create_log(const char *name); +struct osmo_stats_reporter *osmo_stats_reporter_create_statsd(const char *name); + +/* helper functions for reporter implementations */ +int osmo_stats_reporter_send(struct osmo_stats_reporter *srep, const char *data, + int data_len); +int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep); +int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep); +int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep); diff --git a/src/Makefile.am b/src/Makefile.am index 7aa6a78..00b97d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c bits.c \ gsmtap_util.c crc16.c panic.c backtrace.c \ conv.c application.c rbtree.c strrb.c \ loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ - macaddr.c stat_item.c stats.c + macaddr.c stat_item.c stats.c stats_statsd.c BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c diff --git a/src/stats.c b/src/stats.c index 16e2971..5547910 100644 --- a/src/stats.c +++ b/src/stats.c @@ -42,7 +42,7 @@ #include <osmocom/core/msgb.h> #define STATS_DEFAULT_INTERVAL 5 /* secs */ -#define STATS_DEFAULT_STATSD_BUFLEN 256 +#define STATS_DEFAULT_BUFLEN 256 static LLIST_HEAD(osmo_stats_reporter_list); static void *osmo_stats_ctx = NULL; @@ -56,16 +56,6 @@ struct osmo_stats_config *osmo_stats_config = &s_stats_config; static struct osmo_timer_list osmo_stats_timer; -static int osmo_stats_reporter_statsd_open(struct osmo_stats_reporter *srep); -static int osmo_stats_reporter_statsd_close(struct osmo_stats_reporter *srep); -static int osmo_stats_reporter_statsd_send_counter(struct osmo_stats_reporter *srep, - const struct rate_ctr_group *ctrg, - const struct rate_ctr_desc *desc, - int64_t value, int64_t delta); -static int osmo_stats_reporter_statsd_send_item(struct osmo_stats_reporter *srep, - const struct osmo_stat_item_group *statg, - const struct osmo_stat_item_desc *desc, int value); - static int osmo_stats_reporter_log_send_counter(struct osmo_stats_reporter *srep, const struct rate_ctr_group *ctrg, const struct rate_ctr_desc *desc, @@ -74,10 +64,6 @@ static int osmo_stats_reporter_log_send_item(struct osmo_stats_reporter *srep, const struct osmo_stat_item_group *statg, const struct osmo_stat_item_desc *desc, int value); -static int osmo_stats_reporter_send(struct osmo_stats_reporter *srep, const char *data, - int data_len); -static int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep); - static int update_srep_config(struct osmo_stats_reporter *srep) { int rc = 0; @@ -300,7 +286,7 @@ int osmo_stats_reporter_disable(struct osmo_stats_reporter *srep) return update_srep_config(srep); } -static int osmo_stats_reporter_send(struct osmo_stats_reporter *srep, const char *data, +int osmo_stats_reporter_send(struct osmo_stats_reporter *srep, const char *data, int data_len) { int rc; @@ -314,7 +300,7 @@ static int osmo_stats_reporter_send(struct osmo_stats_reporter *srep, const char return rc; } -static int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep) +int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep) { int rc; @@ -394,31 +380,16 @@ static int osmo_stats_reporter_log_send_item(struct osmo_stats_reporter *srep, desc->name, value, desc->unit); } -/*** statsd reporter ***/ - -struct osmo_stats_reporter *osmo_stats_reporter_create_statsd(const char *name) -{ - struct osmo_stats_reporter *srep; - srep = osmo_stats_reporter_alloc(OSMO_STATS_REPORTER_STATSD, name); - - srep->have_net_config = 1; - - srep->open = osmo_stats_reporter_statsd_open; - srep->close = osmo_stats_reporter_statsd_close; - srep->send_counter = osmo_stats_reporter_statsd_send_counter; - srep->send_item = osmo_stats_reporter_statsd_send_item; - - return srep; -} +/*** i/o helper functions ***/ -static int osmo_stats_reporter_statsd_open(struct osmo_stats_reporter *srep) +int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep) { int sock; int rc; - int buffer_size = STATS_DEFAULT_STATSD_BUFLEN; + int buffer_size = STATS_DEFAULT_BUFLEN; - if (srep->fd != -1) - osmo_stats_reporter_statsd_close(srep); + if (srep->fd != -1 && srep->close) + srep->close(srep); sock = socket(AF_INET, SOCK_DGRAM, 0); if (sock == -1) @@ -448,7 +419,7 @@ failed: return rc; } -static int osmo_stats_reporter_statsd_close(struct osmo_stats_reporter *srep) +int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep) { int rc; if (srep->fd == -1) @@ -463,107 +434,6 @@ static int osmo_stats_reporter_statsd_close(struct osmo_stats_reporter *srep) return rc == -1 ? -errno : 0; } -static int osmo_stats_reporter_statsd_send(struct osmo_stats_reporter *srep, - const char *name1, unsigned int index1, const char *name2, int value, - const char *unit) -{ - char *buf; - int buf_size; - int nchars, rc = 0; - char *fmt = NULL; - char *prefix = srep->name_prefix; - int old_len = msgb_length(srep->buffer); - - if (prefix) { - if (name1) { - if (index1 != 0) - fmt = "%1$s.%2$s.%6$u.%3$s:%4$d|%5$s"; - else - fmt = "%1$s.%2$s.%3$s:%4$d|%5$s"; - } else { - fmt = "%1$s.%2$0.0s%3$s:%4$d|%5$s"; - } - } else { - prefix = ""; - if (name1) { - if (index1 != 0) - fmt = "%1$s%2$s.%6$u.%3$s:%4$d|%5$s"; - else - fmt = "%1$s%2$s.%3$s:%4$d|%5$s"; - } else { - fmt = "%1$s%2$0.0s%3$s:%4$d|%5$s"; - } - } - - if (srep->agg_enabled) { - if (msgb_length(srep->buffer) > 0 && - msgb_tailroom(srep->buffer) > 0) - { - msgb_put_u8(srep->buffer, '\n'); - } - } - - buf = (char *)msgb_put(srep->buffer, 0); - buf_size = msgb_tailroom(srep->buffer); - - nchars = snprintf(buf, buf_size, fmt, - prefix, name1, name2, - value, unit, index1); - - if (nchars >= buf_size) { - /* Truncated */ - /* Restore original buffer (without trailing LF) */ - msgb_trim(srep->buffer, old_len); - /* Send it */ - rc = osmo_stats_reporter_send_buffer(srep); - - /* Try again */ - buf = (char *)msgb_put(srep->buffer, 0); - buf_size = msgb_tailroom(srep->buffer); - - nchars = snprintf(buf, buf_size, fmt, - prefix, name1, name2, - value, unit, index1); - - if (nchars >= buf_size) - return -EMSGSIZE; - } - - if (nchars > 0) - msgb_trim(srep->buffer, msgb_length(srep->buffer) + nchars); - - if (!srep->agg_enabled) - rc = osmo_stats_reporter_send_buffer(srep); - - return rc; -} - -static int osmo_stats_reporter_statsd_send_counter(struct osmo_stats_reporter *srep, - const struct rate_ctr_group *ctrg, - const struct rate_ctr_desc *desc, - int64_t value, int64_t delta) -{ - if (ctrg) - return osmo_stats_reporter_statsd_send(srep, - ctrg->desc->group_name_prefix, - ctrg->idx, - desc->name, delta, "c"); - else - return osmo_stats_reporter_statsd_send(srep, - NULL, 0, - desc->name, delta, "c"); -} - -static int osmo_stats_reporter_statsd_send_item(struct osmo_stats_reporter *srep, - const struct osmo_stat_item_group *statg, - const struct osmo_stat_item_desc *desc, int value) -{ - return osmo_stats_reporter_statsd_send(srep, - statg->desc->group_name_prefix, - statg->idx, - desc->name, value, desc->unit); -} - /*** generic rate counter support ***/ static int osmo_stats_reporter_send_counter(struct osmo_stats_reporter *srep, diff --git a/src/stats_statsd.c b/src/stats_statsd.c new file mode 100644 index 0000000..c76f8f6 --- /dev/null +++ b/src/stats_statsd.c @@ -0,0 +1,158 @@ +/* + * (C) 2015 by Sysmocom s.f.m.c. GmbH + * + * Author: Jacob Erlbeck <jerlbeck@sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include <osmocom/core/stats.h> + +#include <string.h> +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stat_item.h> +#include <osmocom/core/msgb.h> + +static int osmo_stats_reporter_statsd_send_counter(struct osmo_stats_reporter *srep, + const struct rate_ctr_group *ctrg, + const struct rate_ctr_desc *desc, + int64_t value, int64_t delta); +static int osmo_stats_reporter_statsd_send_item(struct osmo_stats_reporter *srep, + const struct osmo_stat_item_group *statg, + const struct osmo_stat_item_desc *desc, int value); + +struct osmo_stats_reporter *osmo_stats_reporter_create_statsd(const char *name) +{ + struct osmo_stats_reporter *srep; + srep = osmo_stats_reporter_alloc(OSMO_STATS_REPORTER_STATSD, name); + + srep->have_net_config = 1; + + srep->open = osmo_stats_reporter_udp_open; + srep->close = osmo_stats_reporter_udp_close; + srep->send_counter = osmo_stats_reporter_statsd_send_counter; + srep->send_item = osmo_stats_reporter_statsd_send_item; + + return srep; +} + +static int osmo_stats_reporter_statsd_send(struct osmo_stats_reporter *srep, + const char *name1, unsigned int index1, const char *name2, int value, + const char *unit) +{ + char *buf; + int buf_size; + int nchars, rc = 0; + char *fmt = NULL; + char *prefix = srep->name_prefix; + int old_len = msgb_length(srep->buffer); + + if (prefix) { + if (name1) { + if (index1 != 0) + fmt = "%1$s.%2$s.%6$u.%3$s:%4$d|%5$s"; + else + fmt = "%1$s.%2$s.%3$s:%4$d|%5$s"; + } else { + fmt = "%1$s.%2$0.0s%3$s:%4$d|%5$s"; + } + } else { + prefix = ""; + if (name1) { + if (index1 != 0) + fmt = "%1$s%2$s.%6$u.%3$s:%4$d|%5$s"; + else + fmt = "%1$s%2$s.%3$s:%4$d|%5$s"; + } else { + fmt = "%1$s%2$0.0s%3$s:%4$d|%5$s"; + } + } + + if (srep->agg_enabled) { + if (msgb_length(srep->buffer) > 0 && + msgb_tailroom(srep->buffer) > 0) + { + msgb_put_u8(srep->buffer, '\n'); + } + } + + buf = (char *)msgb_put(srep->buffer, 0); + buf_size = msgb_tailroom(srep->buffer); + + nchars = snprintf(buf, buf_size, fmt, + prefix, name1, name2, + value, unit, index1); + + if (nchars >= buf_size) { + /* Truncated */ + /* Restore original buffer (without trailing LF) */ + msgb_trim(srep->buffer, old_len); + /* Send it */ + rc = osmo_stats_reporter_send_buffer(srep); + + /* Try again */ + buf = (char *)msgb_put(srep->buffer, 0); + buf_size = msgb_tailroom(srep->buffer); + + nchars = snprintf(buf, buf_size, fmt, + prefix, name1, name2, + value, unit, index1); + + if (nchars >= buf_size) + return -EMSGSIZE; + } + + if (nchars > 0) + msgb_trim(srep->buffer, msgb_length(srep->buffer) + nchars); + + if (!srep->agg_enabled) + rc = osmo_stats_reporter_send_buffer(srep); + + return rc; +} + +static int osmo_stats_reporter_statsd_send_counter(struct osmo_stats_reporter *srep, + const struct rate_ctr_group *ctrg, + const struct rate_ctr_desc *desc, + int64_t value, int64_t delta) +{ + if (ctrg) + return osmo_stats_reporter_statsd_send(srep, + ctrg->desc->group_name_prefix, + ctrg->idx, + desc->name, delta, "c"); + else + return osmo_stats_reporter_statsd_send(srep, + NULL, 0, + desc->name, delta, "c"); +} + +static int osmo_stats_reporter_statsd_send_item(struct osmo_stats_reporter *srep, + const struct osmo_stat_item_group *statg, + const struct osmo_stat_item_desc *desc, int value) +{ + return osmo_stats_reporter_statsd_send(srep, + statg->desc->group_name_prefix, + statg->idx, + desc->name, value, desc->unit); +} -- 1.9.1
Due to prior refactoring, the functions do not have an sensible order in the file. This commit tries to improve that a little bit. Sponsored-by: On-Waves ehf --- src/stats.c | 120 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/src/stats.c b/src/stats.c index 5547910..73b2703 100644 --- a/src/stats.c +++ b/src/stats.c @@ -286,6 +286,60 @@ int osmo_stats_reporter_disable(struct osmo_stats_reporter *srep) return update_srep_config(srep); } +/*** i/o helper functions ***/ + +int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep) +{ + int sock; + int rc; + int buffer_size = STATS_DEFAULT_BUFLEN; + + if (srep->fd != -1 && srep->close) + srep->close(srep); + + sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock == -1) + return -errno; + + if (srep->bind_addr_len > 0) { + rc = bind(sock, &srep->bind_addr, srep->bind_addr_len); + if (rc == -1) + goto failed; + } + + srep->fd = sock; + + if (srep->mtu > 0) { + buffer_size = srep->mtu - 20 /* IP */ - 8 /* UDP */; + srep->agg_enabled = 1; + } + + srep->buffer = msgb_alloc(buffer_size, "stats buffer"); + + return 0; + +failed: + rc = -errno; + close(sock); + + return rc; +} + +int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep) +{ + int rc; + if (srep->fd == -1) + return -EBADF; + + osmo_stats_reporter_send_buffer(srep); + + rc = close(srep->fd); + srep->fd = -1; + msgb_free(srep->buffer); + srep->buffer = NULL; + return rc == -1 ? -errno : 0; +} + int osmo_stats_reporter_send(struct osmo_stats_reporter *srep, const char *data, int data_len) { @@ -315,16 +369,6 @@ int osmo_stats_reporter_send_buffer(struct osmo_stats_reporter *srep) return rc; } -static int osmo_stats_reporter_check_config(struct osmo_stats_reporter *srep, - unsigned int index, int class_id) -{ - if (class_id == OSMO_STATS_CLASS_UNKNOWN) - class_id = index != 0 ? - OSMO_STATS_CLASS_SUBSCRIBER : OSMO_STATS_CLASS_GLOBAL; - - return class_id <= srep->max_class; -} - /*** log reporter ***/ struct osmo_stats_reporter *osmo_stats_reporter_create_log(const char *name) @@ -380,58 +424,16 @@ static int osmo_stats_reporter_log_send_item(struct osmo_stats_reporter *srep, desc->name, value, desc->unit); } -/*** i/o helper functions ***/ - -int osmo_stats_reporter_udp_open(struct osmo_stats_reporter *srep) -{ - int sock; - int rc; - int buffer_size = STATS_DEFAULT_BUFLEN; - - if (srep->fd != -1 && srep->close) - srep->close(srep); - - sock = socket(AF_INET, SOCK_DGRAM, 0); - if (sock == -1) - return -errno; +/*** helper for reporting ***/ - if (srep->bind_addr_len > 0) { - rc = bind(sock, &srep->bind_addr, srep->bind_addr_len); - if (rc == -1) - goto failed; - } - - srep->fd = sock; - - if (srep->mtu > 0) { - buffer_size = srep->mtu - 20 /* IP */ - 8 /* UDP */; - srep->agg_enabled = 1; - } - - srep->buffer = msgb_alloc(buffer_size, "stats buffer"); - - return 0; - -failed: - rc = -errno; - close(sock); - - return rc; -} - -int osmo_stats_reporter_udp_close(struct osmo_stats_reporter *srep) +static int osmo_stats_reporter_check_config(struct osmo_stats_reporter *srep, + unsigned int index, int class_id) { - int rc; - if (srep->fd == -1) - return -EBADF; - - osmo_stats_reporter_send_buffer(srep); + if (class_id == OSMO_STATS_CLASS_UNKNOWN) + class_id = index != 0 ? + OSMO_STATS_CLASS_SUBSCRIBER : OSMO_STATS_CLASS_GLOBAL; - rc = close(srep->fd); - srep->fd = -1; - msgb_free(srep->buffer); - srep->buffer = NULL; - return rc == -1 ? -errno : 0; + return class_id <= srep->max_class; } /*** generic rate counter support ***/ -- 1.9.1
This tests uses a dedicated test reported to check several aspects of the value reporting. - addition/removal of stats reporter - addition/removal of counters/items - setting of max_class - initial value flush - updating single counters/items - reporter retrieval - enable/disable Sponsored-by: On-Waves ehf --- tests/stats/stats_test.c | 278 +++++++++++++++++++++++++++++++++++++++++++--- tests/stats/stats_test.ok | 108 ++++++++++++++++++ 2 files changed, 369 insertions(+), 17 deletions(-) diff --git a/tests/stats/stats_test.c b/tests/stats/stats_test.c index f8c7dc0..f6efd3e 100644 --- a/tests/stats/stats_test.c +++ b/tests/stats/stats_test.c @@ -23,28 +23,49 @@ #include <osmocom/core/logging.h> #include <osmocom/core/utils.h> #include <osmocom/core/stat_item.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stats.h> #include <stdio.h> +enum test_ctr { + TEST_A_CTR, + TEST_B_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"}, +}; + +static const struct rate_ctr_group_desc ctrg_desc = { + .group_name_prefix = "ctr-test.one", + .group_description = "Counter test number 1", + .num_ctr = ARRAY_SIZE(ctr_description), + .ctr_desc = ctr_description, + .class_id = OSMO_STATS_CLASS_SUBSCRIBER, +}; + +enum test_items { + TEST_A_ITEM, + TEST_B_ITEM, +}; + +static const struct osmo_stat_item_desc item_description[] = { + [TEST_A_ITEM] = { "item.a", "The A value", "ma", 4, -1 }, + [TEST_B_ITEM] = { "item.b", "The B value", "kb", 7, -1 }, +}; + +static const struct osmo_stat_item_group_desc statg_desc = { + .group_name_prefix = "test.one", + .group_description = "Test number 1", + .num_items = ARRAY_SIZE(item_description), + .item_desc = item_description, + .class_id = OSMO_STATS_CLASS_PEER, +}; + static void stat_test(void) { - enum test_items { - TEST_A_ITEM, - TEST_B_ITEM, - }; - - static const struct osmo_stat_item_desc item_description[] = { - { "item.a", "The A value", "ma", 4, -1 }, - { "item.b", "The B value", "kb", 7, -1 }, - }; - - static const struct osmo_stat_item_group_desc statg_desc = { - .group_name_prefix = "test.one", - .group_description = "Test number 1", - .num_items = ARRAY_SIZE(item_description), - .item_desc = item_description, - }; - struct osmo_stat_item_group *statg = osmo_stat_item_group_alloc(NULL, &statg_desc, 0); @@ -201,6 +222,228 @@ static void stat_test(void) OSMO_ASSERT(sgrp2 == NULL); } +/*** stats reporter tests ***/ + +/* define a special stats reporter for testing */ + +static int send_count; + +enum { + OSMO_STATS_REPORTER_TEST = OSMO_STATS_REPORTER_LOG + 1, +}; + +static int stats_reporter_test_send_counter(struct osmo_stats_reporter *srep, + const struct rate_ctr_group *ctrg, + const struct rate_ctr_desc *desc, + int64_t value, int64_t delta) +{ + const char *group_name = ctrg ? ctrg->desc->group_name_prefix : ""; + + printf(" %s: counter p=%s g=%s i=%u n=%s v=%lld d=%lld\n", + srep->name, + srep->name_prefix ? srep->name_prefix : "", + group_name, ctrg ? ctrg->idx : 0, + desc->name, (long long)value, (long long)delta); + + send_count += 1; + return 0; +} + +static int stats_reporter_test_send_item(struct osmo_stats_reporter *srep, + const struct osmo_stat_item_group *statg, + const struct osmo_stat_item_desc *desc, int value) +{ + printf(" %s: item p=%s g=%s i=%u n=%s v=%d u=%s\n", + srep->name, + srep->name_prefix ? srep->name_prefix : "", + statg->desc->group_name_prefix, statg->idx, + desc->name, value, desc->unit ? desc->unit : ""); + + send_count += 1; + return 0; +} + +static int stats_reporter_test_open(struct osmo_stats_reporter *srep) +{ + printf(" %s: open\n", srep->name); + return 0; +} + +static int stats_reporter_test_close(struct osmo_stats_reporter *srep) +{ + printf(" %s: close\n", srep->name); + return 0; +} + +static struct osmo_stats_reporter *stats_reporter_create_test(const char *name) +{ + struct osmo_stats_reporter *srep; + srep = osmo_stats_reporter_alloc(OSMO_STATS_REPORTER_TEST, name); + + srep->have_net_config = 0; + + srep->open = stats_reporter_test_open; + srep->close = stats_reporter_test_close; + srep->send_counter = stats_reporter_test_send_counter; + srep->send_item = stats_reporter_test_send_item; + + return srep; +} + + +static void test_reporting() +{ + struct osmo_stats_reporter *srep1, *srep2, *srep; + struct osmo_stat_item_group *statg1, *statg2; + struct rate_ctr_group *ctrg1, *ctrg2; + + int rc; + + printf("Start test: %s\n", __func__); + + /* Allocate counters and items */ + statg1 = osmo_stat_item_group_alloc(NULL, &statg_desc, 1); + OSMO_ASSERT(statg1 != NULL); + statg2 = osmo_stat_item_group_alloc(NULL, &statg_desc, 2); + OSMO_ASSERT(statg2 != NULL); + ctrg1 = rate_ctr_group_alloc(NULL, &ctrg_desc, 1); + OSMO_ASSERT(ctrg1 != NULL); + ctrg2 = rate_ctr_group_alloc(NULL, &ctrg_desc, 2); + OSMO_ASSERT(ctrg2 != NULL); + + srep1 = stats_reporter_create_test("test1"); + OSMO_ASSERT(srep1 != NULL); + + srep2 = stats_reporter_create_test("test2"); + OSMO_ASSERT(srep2 != NULL); + + srep = osmo_stats_reporter_find(OSMO_STATS_REPORTER_TEST, "test1"); + OSMO_ASSERT(srep == srep1); + srep = osmo_stats_reporter_find(OSMO_STATS_REPORTER_TEST, "test2"); + OSMO_ASSERT(srep == srep2); + + rc = osmo_stats_reporter_enable(srep1); + OSMO_ASSERT(rc >= 0); + OSMO_ASSERT(srep1->force_single_flush); + rc = osmo_stats_reporter_set_max_class(srep1, OSMO_STATS_CLASS_SUBSCRIBER); + OSMO_ASSERT(rc >= 0); + + rc = osmo_stats_reporter_enable(srep2); + OSMO_ASSERT(rc >= 0); + OSMO_ASSERT(srep2->force_single_flush); + rc = osmo_stats_reporter_set_max_class(srep2, OSMO_STATS_CLASS_SUBSCRIBER); + OSMO_ASSERT(rc >= 0); + + printf("report (initial):\n"); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 16); + + printf("report (srep1 global):\n"); + /* force single flush */ + osmo_stats_reporter_set_max_class(srep1, OSMO_STATS_CLASS_GLOBAL); + srep1->force_single_flush = 1; + srep2->force_single_flush = 1; + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 8); + + printf("report (srep1 peer):\n"); + /* force single flush */ + osmo_stats_reporter_set_max_class(srep1, OSMO_STATS_CLASS_PEER); + srep1->force_single_flush = 1; + srep2->force_single_flush = 1; + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 12); + + printf("report (srep1 subscriber):\n"); + /* force single flush */ + osmo_stats_reporter_set_max_class(srep1, OSMO_STATS_CLASS_SUBSCRIBER); + srep1->force_single_flush = 1; + srep2->force_single_flush = 1; + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 16); + + printf("report (srep2 disabled):\n"); + /* force single flush */ + srep1->force_single_flush = 1; + srep2->force_single_flush = 1; + rc = osmo_stats_reporter_disable(srep2); + OSMO_ASSERT(rc >= 0); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 8); + + printf("report (srep2 enabled, no flush forced):\n"); + rc = osmo_stats_reporter_enable(srep2); + OSMO_ASSERT(rc >= 0); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 8); + + printf("report (should be empty):\n"); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 0); + + printf("report (group 1, counter 1 update):\n"); + rate_ctr_inc(&ctrg1->ctr[TEST_A_CTR]); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 2); + + printf("report (group 1, item 1 update):\n"); + osmo_stat_item_set(statg1->items[TEST_A_ITEM], 10); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 2); + + printf("report (remove statg1, ctrg1):\n"); + /* force single flush */ + srep1->force_single_flush = 1; + srep2->force_single_flush = 1; + osmo_stat_item_group_free(statg1); + rate_ctr_group_free(ctrg1); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 8); + + printf("report (remove srep1):\n"); + /* force single flush */ + srep1->force_single_flush = 1; + srep2->force_single_flush = 1; + osmo_stats_reporter_free(srep1); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 4); + + printf("report (remove statg2):\n"); + /* force single flush */ + srep2->force_single_flush = 1; + osmo_stat_item_group_free(statg2); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 2); + + printf("report (remove srep2):\n"); + /* force single flush */ + srep2->force_single_flush = 1; + osmo_stats_reporter_free(srep2); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 0); + + printf("report (remove ctrg2, should be empty):\n"); + rate_ctr_group_free(ctrg2); + send_count = 0; + osmo_stats_report(); + OSMO_ASSERT(send_count == 0); + + printf("End test: %s\n", __func__); +} + int main(int argc, char **argv) { static const struct log_info log_info = {}; @@ -209,5 +452,6 @@ int main(int argc, char **argv) osmo_stat_item_init(NULL); stat_test(); + test_reporting(); return 0; } diff --git a/tests/stats/stats_test.ok b/tests/stats/stats_test.ok index e69de29..a0c001b 100644 --- a/tests/stats/stats_test.ok +++ b/tests/stats/stats_test.ok @@ -0,0 +1,108 @@ +Start test: test_reporting + test1: open + test2: open +report (initial): + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test1: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test1: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test1: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test1: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test2: item p= g=test.one i=2 n=item.a v=-1 u=ma + test1: item p= g=test.one i=2 n=item.a v=-1 u=ma + test2: item p= g=test.one i=2 n=item.b v=-1 u=kb + test1: item p= g=test.one i=2 n=item.b v=-1 u=kb + test2: item p= g=test.one i=1 n=item.a v=-1 u=ma + test1: item p= g=test.one i=1 n=item.a v=-1 u=ma + test2: item p= g=test.one i=1 n=item.b v=-1 u=kb + test1: item p= g=test.one i=1 n=item.b v=-1 u=kb +report (srep1 global): + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test2: item p= g=test.one i=2 n=item.a v=-1 u=ma + test2: item p= g=test.one i=2 n=item.b v=-1 u=kb + test2: item p= g=test.one i=1 n=item.a v=-1 u=ma + test2: item p= g=test.one i=1 n=item.b v=-1 u=kb +report (srep1 peer): + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test2: item p= g=test.one i=2 n=item.a v=-1 u=ma + test1: item p= g=test.one i=2 n=item.a v=-1 u=ma + test2: item p= g=test.one i=2 n=item.b v=-1 u=kb + test1: item p= g=test.one i=2 n=item.b v=-1 u=kb + test2: item p= g=test.one i=1 n=item.a v=-1 u=ma + test1: item p= g=test.one i=1 n=item.a v=-1 u=ma + test2: item p= g=test.one i=1 n=item.b v=-1 u=kb + test1: item p= g=test.one i=1 n=item.b v=-1 u=kb +report (srep1 subscriber): + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test1: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test1: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test1: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test1: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test2: item p= g=test.one i=2 n=item.a v=-1 u=ma + test1: item p= g=test.one i=2 n=item.a v=-1 u=ma + test2: item p= g=test.one i=2 n=item.b v=-1 u=kb + test1: item p= g=test.one i=2 n=item.b v=-1 u=kb + test2: item p= g=test.one i=1 n=item.a v=-1 u=ma + test1: item p= g=test.one i=1 n=item.a v=-1 u=ma + test2: item p= g=test.one i=1 n=item.b v=-1 u=kb + test1: item p= g=test.one i=1 n=item.b v=-1 u=kb +report (srep2 disabled): + test2: close + test1: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test1: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test1: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test1: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test1: item p= g=test.one i=2 n=item.a v=-1 u=ma + test1: item p= g=test.one i=2 n=item.b v=-1 u=kb + test1: item p= g=test.one i=1 n=item.a v=-1 u=ma + test1: item p= g=test.one i=1 n=item.b v=-1 u=kb +report (srep2 enabled, no flush forced): + test2: open + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=1 n=ctr.b v=0 d=0 + test2: item p= g=test.one i=2 n=item.a v=-1 u=ma + test2: item p= g=test.one i=2 n=item.b v=-1 u=kb + test2: item p= g=test.one i=1 n=item.a v=-1 u=ma + test2: item p= g=test.one i=1 n=item.b v=-1 u=kb +report (should be empty): +report (group 1, counter 1 update): + test2: counter p= g=ctr-test.one i=1 n=ctr.a v=1 d=1 + test1: counter p= g=ctr-test.one i=1 n=ctr.a v=1 d=1 +report (group 1, item 1 update): + test2: item p= g=test.one i=1 n=item.a v=10 u=ma + test1: item p= g=test.one i=1 n=item.a v=10 u=ma +report (remove statg1, ctrg1): + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test1: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test1: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test2: item p= g=test.one i=2 n=item.a v=-1 u=ma + test1: item p= g=test.one i=2 n=item.a v=-1 u=ma + test2: item p= g=test.one i=2 n=item.b v=-1 u=kb + test1: item p= g=test.one i=2 n=item.b v=-1 u=kb +report (remove srep1): + test1: close + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 + test2: item p= g=test.one i=2 n=item.a v=-1 u=ma + test2: item p= g=test.one i=2 n=item.b v=-1 u=kb +report (remove statg2): + test2: counter p= g=ctr-test.one i=2 n=ctr.a v=0 d=0 + test2: counter p= g=ctr-test.one i=2 n=ctr.b v=0 d=0 +report (remove srep2): + test2: close +report (remove ctrg2, should be empty): +End test: test_reporting -- 1.9.1
Adds a rudimentary leak check for the counters and stat items. Sponsored-by: On-Waves ehf --- tests/stats/stats_test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/stats/stats_test.c b/tests/stats/stats_test.c index f6efd3e..75ddf18 100644 --- a/tests/stats/stats_test.c +++ b/tests/stats/stats_test.c @@ -296,19 +296,20 @@ static void test_reporting() struct osmo_stats_reporter *srep1, *srep2, *srep; struct osmo_stat_item_group *statg1, *statg2; struct rate_ctr_group *ctrg1, *ctrg2; + void *stats_ctx = talloc_named_const(NULL, 1, "stats test context"); int rc; printf("Start test: %s\n", __func__); /* Allocate counters and items */ - statg1 = osmo_stat_item_group_alloc(NULL, &statg_desc, 1); + statg1 = osmo_stat_item_group_alloc(stats_ctx, &statg_desc, 1); OSMO_ASSERT(statg1 != NULL); - statg2 = osmo_stat_item_group_alloc(NULL, &statg_desc, 2); + statg2 = osmo_stat_item_group_alloc(stats_ctx, &statg_desc, 2); OSMO_ASSERT(statg2 != NULL); - ctrg1 = rate_ctr_group_alloc(NULL, &ctrg_desc, 1); + ctrg1 = rate_ctr_group_alloc(stats_ctx, &ctrg_desc, 1); OSMO_ASSERT(ctrg1 != NULL); - ctrg2 = rate_ctr_group_alloc(NULL, &ctrg_desc, 2); + ctrg2 = rate_ctr_group_alloc(stats_ctx, &ctrg_desc, 2); OSMO_ASSERT(ctrg2 != NULL); srep1 = stats_reporter_create_test("test1"); @@ -441,6 +442,10 @@ static void test_reporting() osmo_stats_report(); OSMO_ASSERT(send_count == 0); + /* Leak check */ + OSMO_ASSERT(talloc_total_blocks(stats_ctx) == 1); + talloc_free(stats_ctx); + printf("End test: %s\n", __func__); } -- 1.9.1
Currently the counters are scanned twice, once for interval computation and once for reporting. This adds a reminder to move the interval computation code to a special stats reporter which just updates the fields. Sponsored-by: On-Waves ehf --- src/rate_ctr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rate_ctr.c b/src/rate_ctr.c index 50b3fe7..436deef 100644 --- a/src/rate_ctr.c +++ b/src/rate_ctr.c @@ -92,6 +92,9 @@ int64_t rate_ctr_difference(struct rate_ctr *ctr) return result; } +/* TODO: support update intervals > 1s */ +/* TODO: implement this as a special stats reporter */ + static void interval_expired(struct rate_ctr *ctr, enum rate_ctr_intv intv) { /* calculate rate over last interval */ -- 1.9.1
participants (1)
-
Jacob Erlbeck