From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Sun, 1 Dec 2019 16:24:01 +0000 (+0200)
Subject: stats: Add sub-metrics to metrics
X-Git-Tag: 2.3.10~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5842bdeb0129c77e7962b15c07f8086b80e4ef26;p=thirdparty%2Fdovecot%2Fcore.git

stats: Add sub-metrics to metrics

Needed by next commit
---

diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c
index 83b54c922f..23a2072240 100644
--- a/src/stats/stats-metrics.c
+++ b/src/stats/stats-metrics.c
@@ -221,9 +221,14 @@ struct stats_metrics *stats_metrics_init(const struct stats_settings *set)
 
 static void stats_metric_free(struct metric *metric)
 {
+	struct metric *const *metricp;
 	stats_dist_deinit(&metric->duration_stats);
 	for (unsigned int i = 0; i < metric->fields_count; i++)
 		stats_dist_deinit(&metric->fields[i].stats);
+	if (!array_is_created(&metric->sub_metrics))
+		return;
+	array_foreach(&metric->sub_metrics, metricp)
+		stats_metric_free(*metricp);
 }
 
 static void stats_export_deinit(void)
@@ -250,15 +255,24 @@ void stats_metrics_deinit(struct stats_metrics **_metrics)
 	pool_unref(&metrics->pool);
 }
 
+static void stats_metric_reset(struct metric *metric)
+{
+	struct metric *const *metricp;
+	stats_dist_reset(metric->duration_stats);
+	for (unsigned int i = 0; i < metric->fields_count; i++)
+		stats_dist_reset(metric->fields[i].stats);
+	if (!array_is_created(&metric->sub_metrics))
+		return;
+	array_foreach(&metric->sub_metrics, metricp)
+		stats_metric_reset(*metricp);
+}
+
 void stats_metrics_reset(struct stats_metrics *metrics)
 {
 	struct metric *const *metricp;
 
-	array_foreach(&metrics->metrics, metricp) {
-		stats_dist_reset((*metricp)->duration_stats);
-		for (unsigned int i = 0; i < (*metricp)->fields_count; i++)
-			stats_dist_reset((*metricp)->fields[i].stats);
-	}
+	array_foreach(&metrics->metrics, metricp)
+		stats_metric_reset(*metricp);
 }
 
 struct event_filter *
diff --git a/src/stats/stats-metrics.h b/src/stats/stats-metrics.h
index 231048a0e2..685aba6fe9 100644
--- a/src/stats/stats-metrics.h
+++ b/src/stats/stats-metrics.h
@@ -53,12 +53,29 @@ struct metric_field {
 
 struct metric {
 	const char *name;
+	/* When this metric is a sub-metric, then this is the
+	   suffix for name and any sub_names before it.
+
+	   So if we have
+
+	   struct metric imap_command {
+	       event_name = imap_command_finished
+	       group_by = cmd_name
+	   }
+
+	   The metric.name will always be imap_command and for each sub-metric
+	   metric.sub_name will be whatever the cmd_name is, such as 'select'.
+
+	   This is a display name and does not guarantee uniqueness.
+	*/
+	const char *sub_name;
 
 	/* Timing for how long the event existed */
 	struct stats_dist *duration_stats;
 
 	unsigned int fields_count;
 	struct metric_field *fields;
+	ARRAY(struct metric *) sub_metrics;
 
 	struct metric_export_info export_info;
 };