From 52a38ddfde38afcbfa0fd57d1286aaf238dfffcd Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 23 Nov 2017 20:34:02 +0100 Subject: Ctrl: add rate counter group introspection Before user have to know group name and index in advance to request rate counter value. Introduce introspection function which allows user to obtain all the groups and their indexes by requesting 'rate_ctr.*' variable. This simplifies KPI dumping over ctrl interface. Change-Id: Ifad8b4f0360c8bcd123a838676516476e84c246a Related: OS#2550 --- src/ctrl/control_if.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/ctrl') diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 07b17c90..665239a2 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -534,6 +534,19 @@ oom: return CTRL_CMD_ERROR; } +static int ctrl_rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *data) +{ + struct ctrl_cmd *cmd = data; + + cmd->reply = talloc_asprintf_append(cmd->reply, "%s.%u;", ctrg->desc->group_name_prefix, ctrg->idx); + if (!cmd->reply) { + cmd->reply = "OOM"; + return -1; + } + + return 0; +} + /* rate_ctr */ CTRL_CMD_DEFINE(rate_ctr, "rate_ctr *"); static int get_rate_ctr(struct ctrl_cmd *cmd, void *data) @@ -574,6 +587,11 @@ static int get_rate_ctr(struct ctrl_cmd *cmd, void *data) intv = RATE_CTR_INTV_HOUR; } else if (!strcmp(interval, "per_day")) { intv = RATE_CTR_INTV_DAY; + } else if (!strcmp(interval, "*")) { + intv = rate_ctr_for_each_group(ctrl_rate_ctr_group_handler, cmd); + if (intv < 0) + return CTRL_CMD_ERROR; + return CTRL_CMD_REPLY; } else { talloc_free(dup); cmd->reply = "Wrong interval."; -- cgit v1.2.3