Revert "Add variants of functions allowing callers to specify the time to use. (#13791)"revert-13791-timed-rrd

This reverts commit f5abfad0e0af633737e42bfab66923956a3edcf5.

3 files changed, 43 insertions, 64 deletions

diff --git a/database/rrd.h b/database/rrd.h
index ddc1a9b834..21d8502340 100644
--- a/database/rrd.h
+++ b/database/rrd.h
@@ -1212,10 +1212,8 @@ static inline RRDSET *rrdset_find_active_byname_localhost(const char *name)
 
 void rrdset_next_usec_unfiltered(RRDSET *st, usec_t microseconds);
 void rrdset_next_usec(RRDSET *st, usec_t microseconds);
-void rrdset_timed_next(RRDSET *st, struct timeval now, usec_t microseconds);
 #define rrdset_next(st) rrdset_next_usec(st, 0ULL)
 
-void rrdset_timed_done(RRDSET *st, struct timeval now);
 void rrdset_done(RRDSET *st);
 
 void rrdset_is_obsolete(RRDSET *st);
@@ -1261,17 +1259,13 @@ int rrddim_unhide(RRDSET *st, const char *id);
 void rrddim_is_obsolete(RRDSET *st, RRDDIM *rd);
 void rrddim_isnot_obsolete(RRDSET *st, RRDDIM *rd);
 
-collected_number rrddim_timed_set_by_pointer(RRDSET *st, RRDDIM *rd, struct timeval collected_time, collected_number value);
 collected_number rrddim_set_by_pointer(RRDSET *st, RRDDIM *rd, collected_number value);
 collected_number rrddim_set(RRDSET *st, const char *id, collected_number value);
-
 #ifdef ENABLE_ACLK
 time_t calc_dimension_liveness(RRDDIM *rd, time_t now);
 #endif
 long align_entries_to_pagesize(RRD_MEMORY_MODE mode, long entries);
 
-void rrddim_store_metric(RRDDIM *rd, usec_t point_end_time_ut, NETDATA_DOUBLE n, SN_FLAGS flags);
-
 // ----------------------------------------------------------------------------
 // Miscellaneous functions
 
diff --git a/database/rrddim.c b/database/rrddim.c
index 2626baf65d..d47864fc5a 100644
--- a/database/rrddim.c
+++ b/database/rrddim.c
@@ -549,29 +549,23 @@ inline void rrddim_isnot_obsolete(RRDSET *st __maybe_unused, RRDDIM *rd) {
 // ----------------------------------------------------------------------------
 // RRDDIM - collect values for a dimension
 
-inline collected_number rrddim_set_by_pointer(RRDSET *st, RRDDIM *rd, collected_number value) {
-    struct timeval now;
-    now_realtime_timeval(&now);
-
-    return rrddim_timed_set_by_pointer(st, rd, now, value);
-}
-
-collected_number rrddim_timed_set_by_pointer(RRDSET *st __maybe_unused, RRDDIM *rd, struct timeval collected_time, collected_number value) {
+inline collected_number rrddim_set_by_pointer(RRDSET *st __maybe_unused, RRDDIM *rd, collected_number value) {
     debug(D_RRD_CALLS, "rrddim_set_by_pointer() for chart %s, dimension %s, value " COLLECTED_NUMBER_FORMAT, rrdset_name(st), rrddim_name(rd), value);
 
-    rd->last_collected_time = collected_time;
+    now_realtime_timeval(&rd->last_collected_time);
     rd->collected_value = value;
     rd->updated = 1;
+
     rd->collections_counter++;
 
     collected_number v = (value >= 0) ? value : -value;
-    if (unlikely(v > rd->collected_value_max))
-        rd->collected_value_max = v;
+    if(unlikely(v > rd->collected_value_max)) rd->collected_value_max = v;
+
+    // fprintf(stderr, "%s.%s %llu " COLLECTED_NUMBER_FORMAT " dt %0.6f" " rate " NETDATA_DOUBLE_FORMAT "\n", st->name, rd->name, st->usec_since_last_update, value, (float)((double)st->usec_since_last_update / (double)1000000), (NETDATA_DOUBLE)((value - rd->last_collected_value) * (NETDATA_DOUBLE)rd->multiplier / (NETDATA_DOUBLE)rd->divisor * 1000000.0 / (NETDATA_DOUBLE)st->usec_since_last_update));
 
     return rd->last_collected_value;
 }
 
-
 collected_number rrddim_set(RRDSET *st, const char *id, collected_number value) {
     RRDHOST *host = st->rrdhost;
     RRDDIM *rd = rrddim_find(st, id);
diff --git a/database/rrdset.c b/database/rrdset.c
index 67e2bc7245..73e3274f41 100644
--- a/database/rrdset.c
+++ b/database/rrdset.c
@@ -860,18 +860,31 @@ RRDSET *rrdset_create_custom(
 // ----------------------------------------------------------------------------
 // RRDSET - data collection iteration control
 
-void rrdset_timed_next(RRDSET *st, struct timeval now, usec_t duration_since_last_update) {
+inline void rrdset_next_usec_unfiltered(RRDSET *st, usec_t microseconds) {
+    if(unlikely(!st->last_collected_time.tv_sec || !microseconds || (rrdset_flag_check(st, RRDSET_FLAG_SYNC_CLOCK)))) {
+        // call the full next_usec() function
+        rrdset_next_usec(st, microseconds);
+        return;
+    }
+
+    st->usec_since_last_update = microseconds;
+}
+
+inline void rrdset_next_usec(RRDSET *st, usec_t microseconds) {
+    struct timeval now;
+    now_realtime_timeval(&now);
+
     #ifdef NETDATA_INTERNAL_CHECKS
     char *discard_reason = NULL;
-    usec_t discarded = duration_since_last_update;
+    usec_t discarded = microseconds;
     #endif
 
     if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_SYNC_CLOCK))) {
         // the chart needs to be re-synced to current time
         rrdset_flag_clear(st, RRDSET_FLAG_SYNC_CLOCK);
 
-        // discard the duration supplied
-        duration_since_last_update = 0;
+        // discard the microseconds supplied
+        microseconds = 0;
 
         #ifdef NETDATA_INTERNAL_CHECKS
         if(!discard_reason) discard_reason = "SYNC CLOCK FLAG";
@@ -880,14 +893,14 @@ void rrdset_timed_next(RRDSET *st, struct timeval now, usec_t duration_since_las
 
     if(unlikely(!st->last_collected_time.tv_sec)) {
         // the first entry
-        duration_since_last_update = st->update_every * USEC_PER_SEC;
+        microseconds = st->update_every * USEC_PER_SEC;
         #ifdef NETDATA_INTERNAL_CHECKS
         if(!discard_reason) discard_reason = "FIRST DATA COLLECTION";
         #endif
     }
-    else if(unlikely(!duration_since_last_update)) {
+    else if(unlikely(!microseconds)) {
         // no dt given by the plugin
-        duration_since_last_update = dt_usec(&now, &st->last_collected_time);
+        microseconds = dt_usec(&now, &st->last_collected_time);
         #ifdef NETDATA_INTERNAL_CHECKS
         if(!discard_reason) discard_reason = "NO USEC GIVEN BY COLLECTOR";
         #endif
@@ -911,7 +924,7 @@ void rrdset_timed_next(RRDSET *st, struct timeval now, usec_t duration_since_las
             st->last_updated.tv_usec = now.tv_usec;
             last_updated_time_align(st);
 
-            duration_since_last_update = st->update_every * USEC_PER_SEC;
+            microseconds    = st->update_every * USEC_PER_SEC;
             #ifdef NETDATA_INTERNAL_CHECKS
             if(!discard_reason) discard_reason = "COLLECTION TIME IN FUTURE";
             #endif
@@ -923,21 +936,21 @@ void rrdset_timed_next(RRDSET *st, struct timeval now, usec_t duration_since_las
                 " secs in the past (counter #%zu, update #%zu). Adjusting it to current time.", rrdset_id(st), rrdhost_hostname(st->rrdhost), (NETDATA_DOUBLE)since_last_usec / USEC_PER_SEC, st->counter, st->counter_done);
             #endif
 
-            duration_since_last_update = (usec_t)since_last_usec;
+            microseconds = (usec_t)since_last_usec;
             #ifdef NETDATA_INTERNAL_CHECKS
             if(!discard_reason) discard_reason = "COLLECTION TIME TOO FAR IN THE PAST";
             #endif
         }
 
 #ifdef NETDATA_INTERNAL_CHECKS
-        if(since_last_usec > 0 && (susec_t) duration_since_last_update < since_last_usec) {
+        if(since_last_usec > 0 && (susec_t)microseconds < since_last_usec) {
             static __thread susec_t min_delta = USEC_PER_SEC * 3600, permanent_min_delta = 0;
             static __thread time_t last_t = 0;
 
             // the first time initialize it so that it will make the check later
             if(last_t == 0) last_t = now.tv_sec + 60;
 
-            susec_t delta = since_last_usec - (susec_t) duration_since_last_update;
+            susec_t delta = since_last_usec - (susec_t)microseconds;
             if(delta < min_delta) min_delta = delta;
 
             if(now.tv_sec >= last_t + 60) {
@@ -955,39 +968,23 @@ void rrdset_timed_next(RRDSET *st, struct timeval now, usec_t duration_since_las
     }
 
     #ifdef NETDATA_INTERNAL_CHECKS
-    debug(D_RRD_CALLS, "rrdset_timed_next() for chart %s with duration since last update %llu usec", rrdset_name(st), duration_since_last_update);
-    rrdset_debug(st, "NEXT: %llu microseconds", duration_since_last_update);
+    debug(D_RRD_CALLS, "rrdset_next_usec() for chart %s with microseconds %llu", rrdset_name(st), microseconds);
+    rrdset_debug(st, "NEXT: %llu microseconds", microseconds);
 
-    if(discarded && discarded != duration_since_last_update)
-        info("host '%s', chart '%s': discarded data collection time of %llu usec, replaced with %llu usec, reason: '%s'", rrdhost_hostname(st->rrdhost), rrdset_id(st), discarded, duration_since_last_update, discard_reason?discard_reason:"UNDEFINED");
+    if(discarded && discarded != microseconds)
+        info("host '%s', chart '%s': discarded data collection time of %llu usec, replaced with %llu usec, reason: '%s'", rrdhost_hostname(st->rrdhost), rrdset_id(st), discarded, microseconds, discard_reason?discard_reason:"UNDEFINED");
 
     #endif
 
-    st->usec_since_last_update = duration_since_last_update;
+    st->usec_since_last_update = microseconds;
 }
 
-inline void rrdset_next_usec_unfiltered(RRDSET *st, usec_t duration_since_last_update) {
-    if(unlikely(!st->last_collected_time.tv_sec || !duration_since_last_update || (rrdset_flag_check(st, RRDSET_FLAG_SYNC_CLOCK)))) {
-        // call the full next_usec() function
-        rrdset_next_usec(st, duration_since_last_update);
-        return;
-    }
-
-    st->usec_since_last_update = duration_since_last_update;
-}
-
-inline void rrdset_next_usec(RRDSET *st, usec_t duration_since_last_update) {
-    struct timeval now;
-
-    now_realtime_timeval(&now);
-    rrdset_timed_next(st, now, duration_since_last_update);
-}
 
 // ----------------------------------------------------------------------------
 // RRDSET - process the collected values for all dimensions of a chart
 
-static inline usec_t rrdset_init_last_collected_time(RRDSET *st, struct timeval now) {
-    st->last_collected_time = now;
+static inline usec_t rrdset_init_last_collected_time(RRDSET *st) {
+    now_realtime_timeval(&st->last_collected_time);
     last_collected_time_align(st);
 
     usec_t last_collect_ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec;
@@ -1095,7 +1092,8 @@ void store_metric_at_tier(RRDDIM *rd, struct rrddim_tier *t, STORAGE_POINT sp, u
     }
 }
 
-void rrddim_store_metric(RRDDIM *rd, usec_t point_end_time_ut, NETDATA_DOUBLE n, SN_FLAGS flags) {
+static void store_metric(RRDDIM *rd, usec_t point_end_time_ut, NETDATA_DOUBLE n, SN_FLAGS flags) {
+
     // store the metric on tier 0
     rd->tiers[0]->collect_ops.store_metric(rd->tiers[0]->db_collection_handle, point_end_time_ut, n, 0, 0, 1, 0, flags);
 
@@ -1284,7 +1282,7 @@ static inline size_t rrdset_done_interpolate(
 
             if(unlikely(!store_this_entry)) {
                 (void) ml_is_anomalous(rd, 0, false);
-                rrddim_store_metric(rd, next_store_ut, NAN, SN_FLAG_NONE);
+                store_metric(rd, next_store_ut, NAN, SN_FLAG_NONE);
                 continue;
             }
 
@@ -1296,7 +1294,7 @@ static inline size_t rrdset_done_interpolate(
                     dim_storage_flags &= ~((storage_number)SN_FLAG_NOT_ANOMALOUS);
                 }
 
-                rrddim_store_metric(rd, next_store_ut, new_value, dim_storage_flags);
+                store_metric(rd, next_store_ut, new_value, dim_storage_flags);
                 rd->last_stored_value = new_value;
             }
             else {
@@ -1306,7 +1304,7 @@ static inline size_t rrdset_done_interpolate(
                 rrdset_debug(st, "%s: STORE[%ld] = NON EXISTING ", rrddim_name(rd), current_entry);
                 #endif
 
-                rrddim_store_metric(rd, next_store_ut, NAN, SN_FLAG_NONE);
+                store_metric(rd, next_store_ut, NAN, SN_FLAG_NONE);
                 rd->last_stored_value = NAN;
             }
 
@@ -1371,13 +1369,6 @@ static inline void rrdset_done_fill_the_gap(RRDSET *st) {
 }
 
 void rrdset_done(RRDSET *st) {
-    struct timeval now;
-
-    now_realtime_timeval(&now);
-    rrdset_timed_done(st, now);
-}
-
-void rrdset_timed_done(RRDSET *st, struct timeval now) {
     if(unlikely(netdata_exit)) return;
 
     debug(D_RRD_CALLS, "rrdset_done() for chart %s", rrdset_name(st));
@@ -1421,7 +1412,7 @@ void rrdset_timed_done(RRDSET *st, struct timeval now) {
     if(unlikely(!st->last_collected_time.tv_sec)) {
         // it is the first entry
         // set the last_collected_time to now
-        last_collect_ut = rrdset_init_last_collected_time(st, now) - update_every_ut;
+        last_collect_ut = rrdset_init_last_collected_time(st) - update_every_ut;
 
         // the first entry should not be stored
         store_this_entry = 0;