Adding upstream version 1.39.0.upstream/1.39.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 53 insertions, 55 deletions

diff --git a/web/api/queries/max/README.md b/web/api/queries/max/README.md
index 48da7cf08..82749c4ab 100644
--- a/web/api/queries/max/README.md
+++ b/web/api/queries/max/README.md
@@ -1,6 +1,10 @@
 <!--
 title: "Max"
+sidebar_label: "Max"
 custom_edit_url: https://github.com/netdata/netdata/edit/master/web/api/queries/max/README.md
+learn_status: "Published"
+learn_topic_type: "References"
+learn_rel_path: "Developers/Web/Api/Queries"
 -->
 
 # Max
diff --git a/web/api/queries/max/max.c b/web/api/queries/max/max.c
index 73cf9fa66..cc5999a29 100644
--- a/web/api/queries/max/max.c
+++ b/web/api/queries/max/max.c
@@ -5,53 +5,3 @@
 // ----------------------------------------------------------------------------
 // max
 
-struct grouping_max {
-    NETDATA_DOUBLE max;
-    size_t count;
-};
-
-void grouping_create_max(RRDR *r, const char *options __maybe_unused) {
-    r->internal.grouping_data = onewayalloc_callocz(r->internal.owa, 1, sizeof(struct grouping_max));
-}
-
-// resets when switches dimensions
-// so, clear everything to restart
-void grouping_reset_max(RRDR *r) {
-    struct grouping_max *g = (struct grouping_max *)r->internal.grouping_data;
-    g->max = 0;
-    g->count = 0;
-}
-
-void grouping_free_max(RRDR *r) {
-    onewayalloc_freez(r->internal.owa, r->internal.grouping_data);
-    r->internal.grouping_data = NULL;
-}
-
-void grouping_add_max(RRDR *r, NETDATA_DOUBLE value) {
-    struct grouping_max *g = (struct grouping_max *)r->internal.grouping_data;
-
-    if(!g->count || fabsndd(value) > fabsndd(g->max)) {
-        g->max = value;
-        g->count++;
-    }
-}
-
-NETDATA_DOUBLE grouping_flush_max(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
-    struct grouping_max *g = (struct grouping_max *)r->internal.grouping_data;
-
-    NETDATA_DOUBLE value;
-
-    if(unlikely(!g->count)) {
-        value = 0.0;
-        *rrdr_value_options_ptr |= RRDR_VALUE_EMPTY;
-    }
-    else {
-        value = g->max;
-    }
-
-    g->max = 0.0;
-    g->count = 0;
-
-    return value;
-}
-
diff --git a/web/api/queries/max/max.h b/web/api/queries/max/max.h
index e2427d26d..c26bb79ad 100644
--- a/web/api/queries/max/max.h
+++ b/web/api/queries/max/max.h
@@ -6,10 +6,54 @@
 #include "../query.h"
 #include "../rrdr.h"
 
-void grouping_create_max(RRDR *r, const char *options __maybe_unused);
-void grouping_reset_max(RRDR *r);
-void grouping_free_max(RRDR *r);
-void grouping_add_max(RRDR *r, NETDATA_DOUBLE value);
-NETDATA_DOUBLE grouping_flush_max(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr);
+struct tg_max {
+    NETDATA_DOUBLE max;
+    size_t count;
+};
+
+static inline void tg_max_create(RRDR *r, const char *options __maybe_unused) {
+    r->time_grouping.data = onewayalloc_callocz(r->internal.owa, 1, sizeof(struct tg_max));
+}
+
+// resets when switches dimensions
+// so, clear everything to restart
+static inline void tg_max_reset(RRDR *r) {
+    struct tg_max *g = (struct tg_max *)r->time_grouping.data;
+    g->max = 0;
+    g->count = 0;
+}
+
+static inline void tg_max_free(RRDR *r) {
+    onewayalloc_freez(r->internal.owa, r->time_grouping.data);
+    r->time_grouping.data = NULL;
+}
+
+static inline void tg_max_add(RRDR *r, NETDATA_DOUBLE value) {
+    struct tg_max *g = (struct tg_max *)r->time_grouping.data;
+
+    if(!g->count || fabsndd(value) > fabsndd(g->max)) {
+        g->max = value;
+        g->count++;
+    }
+}
+
+static inline NETDATA_DOUBLE tg_max_flush(RRDR *r, RRDR_VALUE_FLAGS *rrdr_value_options_ptr) {
+    struct tg_max *g = (struct tg_max *)r->time_grouping.data;
+
+    NETDATA_DOUBLE value;
+
+    if(unlikely(!g->count)) {
+        value = 0.0;
+        *rrdr_value_options_ptr |= RRDR_VALUE_EMPTY;
+    }
+    else {
+        value = g->max;
+    }
+
+    g->max = 0.0;
+    g->count = 0;
+
+    return value;
+}
 
 #endif //NETDATA_API_QUERY_MAX_H