aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-05-10 11:52:02 +0200
committerHarald Welte <laforge@gnumonks.org>2019-05-10 11:52:58 +0200
commitea8272c3b619ab7a03eab811050c0700e05fd398 (patch)
treef1ba17401aba970fe8dde821dc1dab873c110dfe
parente87693c820be9542e46477716977b16ed22a46d8 (diff)
Revert "Print error message if application fails to call rate_ctr_init()"
This reverts commit 9685a48c7bc83b1f5ee9b51e29419164b387ade2 which has caused massive fall-out among (particularly) unit tests in osmo-{msc,bts,pcu}. Change-Id: Iede72e86451d94cf678045992cb71f6b1bf16896
-rw-r--r--src/rate_ctr.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rate_ctr.c b/src/rate_ctr.c
index 99ec523..026670b 100644
--- a/src/rate_ctr.c
+++ b/src/rate_ctr.c
@@ -69,7 +69,7 @@
#include <osmocom/core/logging.h>
static LLIST_HEAD(rate_ctr_groups);
-static struct osmo_timer_list rate_ctr_timer;
+
static void *tall_rate_ctr_ctx;
@@ -217,10 +217,6 @@ struct rate_ctr_group *rate_ctr_group_alloc(void *ctx,
unsigned int size;
struct rate_ctr_group *group;
- if (!osmo_timer_pending(&rate_ctr_timer))
- LOGP(DLGLOBAL, LOGL_ERROR, "your program appears to use libosmocore rate_ctr "
- "without calling rate_ctr_init() at start-up. Rate counters won't work!\n");
-
if (rate_ctr_get_group_by_name_idx(desc->group_name_prefix, idx)) {
unsigned int new_idx = rate_ctr_get_unused_name_idx(desc->group_name_prefix);
LOGP(DLGLOBAL, LOGL_ERROR, "counter group '%s' already exists for index %u,"
@@ -298,6 +294,7 @@ static void interval_expired(struct rate_ctr *ctr, enum rate_ctr_intv intv)
ctr->intv[intv+1].rate += ctr->intv[intv].rate;
}
+static struct osmo_timer_list rate_ctr_timer;
static uint64_t timer_ticks;
/* The one-second interval has expired */