fixes for enabling clion debugging

[netdata.git] / src / rrd2json.c

diff --git a/src/rrd2json.c b/src/rrd2json.c
index bbf48a2965c44e06bb0fa34a779a5c59439fa2c1..b2c1a05583ab535f4ed22a7164ad164e4e913c3b 100644 (file)
--- a/src/rrd2json.c
+++ b/src/rrd2json.c
@@ -1,8 +1,5 @@
 #include "common.h"
 
-#define HOSTNAME_MAX 1024
-char *hostname = "unknown";
-
 void rrd_stats_api_v1_chart(RRDSET *st, BUFFER *wb)
 {
     pthread_rwlock_rdlock(&st->rwlock);
@@ -62,9 +59,13 @@ void rrd_stats_api_v1_chart(RRDSET *st, BUFFER *wb)
         c++;
     }
 
+    buffer_strcat(wb, "\n\t\t\t},\n\t\t\t\"green\": ");
+    buffer_rrd_value(wb, st->green);
+    buffer_strcat(wb, ",\n\t\t\t\"red\": ");
+    buffer_rrd_value(wb, st->red);
+
     buffer_sprintf(wb,
-        "\n\t\t\t}\n"
-        "\t\t}"
+        "\n\t\t}"
         );
 
     pthread_rwlock_unlock(&st->rwlock);
@@ -80,7 +81,7 @@ void rrd_stats_api_v1_charts(BUFFER *wb)
         ",\n\t\"update_every\": %d"
         ",\n\t\"history\": %d"
         ",\n\t\"charts\": {"
-        , hostname
+        , localhost.hostname
         , rrd_update_every
         , rrd_default_history_entries
         );
@@ -242,7 +243,7 @@ void rrd_stats_all_json(BUFFER *wb)
         "\t\"history\": %d,\n"
         "\t\"memory\": %lu\n"
         "}\n"
-        , hostname
+        , localhost.hostname
         , rrd_update_every
         , rrd_default_history_entries
         , memory
@@ -1035,12 +1036,12 @@ inline static calculated_number rrdr2value(RRDR *r, long i, uint32_t options, in
     }
 
     if(unlikely(all_null)) {
-        if(likely(*all_values_are_null))
+        if(likely(all_values_are_null))
             *all_values_are_null = 1;
         return 0;
     }
     else {
-        if(likely(*all_values_are_null))
+        if(likely(all_values_are_null))
             *all_values_are_null = 0;
     }
 
@@ -1157,7 +1158,7 @@ inline static void rrdr_free(RRDR *r)
     freez(r);
 }
 
-inline void rrdr_done(RRDR *r)
+static inline void rrdr_done(RRDR *r)
 {
     r->rows = r->c + 1;
     r->c = 0;
@@ -1213,13 +1214,13 @@ RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int g
         absolute_period_requested = 0;
     }
 
-    // allow relative for before and after
-    if(((before < 0)?-before:before) <= (st->update_every * st->entries)) {
+    // allow relative for before and after (smaller than 3 years)
+    if(((before < 0)?-before:before) <= (3 * 365 * 86400)) {
         before = last_entry_t + before;
         absolute_period_requested = 0;
     }
 
-    if(((after < 0)?-after:after) <= (st->update_every * st->entries)) {
+    if(((after < 0)?-after:after) <= (3 * 365 * 86400)) {
         if(after == 0) after = -st->update_every;
         after = before + after;
         absolute_period_requested = 0;
@@ -1366,7 +1367,7 @@ RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int g
     long c;
     for( rd = st->dimensions, c = 0 ; rd && c < dimensions ; rd = rd->next, c++) {
         last_values[c] = 0;
-        group_values[c] = 0;
+        group_values[c] = (group_method == GROUP_MAX || group_method == GROUP_MIN)?NAN:0;
         group_counts[c] = 0;
         group_options[c] = 0;
         found_non_zero[c] = 0;
@@ -1445,14 +1446,22 @@ RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int g
                 group_options[c] |= RRDR_RESET;
 
             switch(group_method) {
+                case GROUP_MIN:
+                    if(unlikely(isnan(group_values[c])) ||
+                            fabsl(value) < fabsl(group_values[c]))
+                        group_values[c] = value;
+                    break;
+
                 case GROUP_MAX:
-                    if(unlikely(fabsl(value) > fabsl(group_values[c])))
+                    if(unlikely(isnan(group_values[c])) ||
+                            fabsl(value) > fabsl(group_values[c]))
                         group_values[c] = value;
                     break;
 
                 default:
                 case GROUP_SUM:
                 case GROUP_AVERAGE:
+                case GROUP_UNDEFINED:
                     group_values[c] += value;
                     break;
 
@@ -1487,23 +1496,39 @@ RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int g
                 if(unlikely(group_counts[c] == 0)) {
                     cn[c] = 0.0;
                     co[c] |= RRDR_EMPTY;
-                }
-                else if(unlikely(group_method == GROUP_AVERAGE)) {
-                    // GROUP_AVERAGE
-                    cn[c] = group_values[c] / group_counts[c];
+                    group_values[c] = (group_method == GROUP_MAX || group_method == GROUP_MIN)?NAN:0;
                 }
                 else {
-                    // GROUP_SUM
-                    // GROUP_MAX
-                    // GROUP_INCREMENTAL_SUM
-                    cn[c] = group_values[c];
-                }
+                    switch(group_method) {
+                        case GROUP_MIN:
+                        case GROUP_MAX:
+                            if(unlikely(isnan(group_values[c])))
+                                cn[c] = 0;
+                            else {
+                                cn[c] = group_values[c];
+                                group_values[c] = NAN;
+                            }
+                            break;
+
+                        case GROUP_SUM:
+                        case GROUP_INCREMENTAL_SUM:
+                            cn[c] = group_values[c];
+                            group_values[c] = 0;
+                            break;
+
+                        default:
+                        case GROUP_AVERAGE:
+                        case GROUP_UNDEFINED:
+                            cn[c] = group_values[c] / group_counts[c];
+                            group_values[c] = 0;
+                            break;
+                    }
 
-                if(cn[c] < r->min) r->min = cn[c];
-                if(cn[c] > r->max) r->max = cn[c];
+                    if(cn[c] < r->min) r->min = cn[c];
+                    if(cn[c] > r->max) r->max = cn[c];
+                }
 
-                // reset them for the next loop
-                group_values[c] = 0;
+                // reset for the next loop
                 group_counts[c] = 0;
                 group_options[c] = 0;
             }
@@ -1520,7 +1545,7 @@ RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int g
     return r;
 }
 
-int rrd2value(RRDSET *st, BUFFER *wb, calculated_number *n, BUFFER *dimensions, long points, long long after, long long before, int group_method, uint32_t options, time_t *latest_timestamp, int *value_is_null)
+int rrd2value(RRDSET *st, BUFFER *wb, calculated_number *n, const char *dimensions, long points, long long after, long long before, int group_method, uint32_t options, time_t *db_after, time_t *db_before, int *value_is_null)
 {
     RRDR *r = rrd2rrdr(st, points, after, before, group_method, !(options & RRDR_OPTION_NOT_ALIGNED));
     if(!r) {
@@ -1530,22 +1555,26 @@ int rrd2value(RRDSET *st, BUFFER *wb, calculated_number *n, BUFFER *dimensions,
 
     if(rrdr_rows(r) == 0) {
         rrdr_free(r);
+
+        if(db_after)  *db_after  = 0;
+        if(db_before) *db_before = 0;
         if(value_is_null) *value_is_null = 1;
+
         return 400;
     }
 
     if(r->result_options & RRDR_RESULT_OPTION_RELATIVE)
-        wb->options |= WB_CONTENT_NO_CACHEABLE;
+        buffer_no_cacheable(wb);
     else if(r->result_options & RRDR_RESULT_OPTION_ABSOLUTE)
-        wb->options |= WB_CONTENT_CACHEABLE;
+        buffer_cacheable(wb);
 
-    options = rrdr_check_options(r, options, (dimensions)?buffer_tostring(dimensions):NULL);
+    options = rrdr_check_options(r, options, dimensions);
 
     if(dimensions)
-        rrdr_disable_not_selected_dimensions(r, buffer_tostring(dimensions));
+        rrdr_disable_not_selected_dimensions(r, dimensions);
 
-    if(latest_timestamp)
-        *latest_timestamp = r->before;
+    if(db_after)  *db_after  = r->after;
+    if(db_before) *db_before = r->before;
 
     long i = (options & RRDR_OPTION_REVERSED)?rrdr_rows(r) - 1:0;
     *n = rrdr2value(r, i, options, value_is_null);
@@ -1563,9 +1592,9 @@ int rrd2format(RRDSET *st, BUFFER *wb, BUFFER *dimensions, uint32_t format, long
     }
 
     if(r->result_options & RRDR_RESULT_OPTION_RELATIVE)
-        wb->options |= WB_CONTENT_NO_CACHEABLE;
+        buffer_no_cacheable(wb);
     else if(r->result_options & RRDR_RESULT_OPTION_ABSOLUTE)
-        wb->options |= WB_CONTENT_CACHEABLE;
+        buffer_cacheable(wb);
 
     options = rrdr_check_options(r, options, (dimensions)?buffer_tostring(dimensions):NULL);