1 files changed, 52 insertions, 5 deletions
diff --git a/web/api/queries/average/average.h b/web/api/queries/average/average.h
index b3196688..2d77cc57 100644
--- a/web/api/queries/average/average.h
+++ b/web/api/queries/average/average.h
@@ -6,10 +6,57 @@
 #include "../query.h"
 #include "../rrdr.h"
 
-void grouping_create_average(RRDR *r, const char *options __maybe_unused);
-void grouping_reset_average(RRDR *r);
-void grouping_free_average(RRDR *r);
-void grouping_add_average(RRDR *r, NETDATA_DOUBLE value);
-NETDATA_DOUBLE grouping_flush_average(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr);
+// ----------------------------------------------------------------------------
+// average
+
+struct tg_average {
+    NETDATA_DOUBLE sum;
+    size_t count;
+};
+
+static inline void tg_average_create(RRDR *r, const char *options __maybe_unused) {
+    r->time_grouping.data = onewayalloc_callocz(r->internal.owa, 1, sizeof(struct tg_average));
+}
+
+// resets when switches dimensions
+// so, clear everything to restart
+static inline void tg_average_reset(RRDR *r) {
+    struct tg_average *g = (struct tg_average *)r->time_grouping.data;
+    g->sum = 0;
+    g->count = 0;
+}
+
+static inline void tg_average_free(RRDR *r) {
+    onewayalloc_freez(r->internal.owa, r->time_grouping.data);
+    r->time_grouping.data = NULL;
+}
+
+static inline void tg_average_add(RRDR *r, NETDATA_DOUBLE value) {
+    struct tg_average *g = (struct tg_average *)r->time_grouping.data;
+    g->sum += value;
+    g->count++;
+}
+
+static inline NETDATA_DOUBLE tg_average_flush(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
+    struct tg_average *g = (struct tg_average *)r->time_grouping.data;
+
+    NETDATA_DOUBLE value;
+
+    if(unlikely(!g->count)) {
+        value = 0.0;
+        *rrdr_value_options_ptr |= RRDR_VALUE_EMPTY;
+    }
+    else {
+        if(unlikely(r->time_grouping.resampling_group != 1))
+            value = g->sum / r->time_grouping.resampling_divisor;
+        else
+            value = g->sum / g->count;
+    }
+
+    g->sum = 0.0;
+    g->count = 0;
+
+    return value;
+}
 
 #endif //NETDATA_API_QUERY_AVERAGE_H