pass microseconds to central netdata; fix unittest not initializing properly

diff --git a/src/main.c b/src/main.c
index 59393700188377a3d47aa1354e3a967e4350d3d5..c4e65c8b39eb60a9514bf1ccf9b60510585837f0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -355,6 +355,16 @@ static const char *verify_required_directory(const char *dir) {
     return dir;
 }
 
+static void get_netdata_configured_directories() {
+    netdata_configured_config_dir  = config_get("global", "config directory",    CONFIG_DIR);
+    netdata_configured_log_dir     = config_get("global", "log directory",       LOG_DIR);
+    netdata_configured_plugins_dir = config_get("global", "plugins directory",   PLUGINS_DIR);
+    netdata_configured_web_dir     = config_get("global", "web files directory", WEB_DIR);
+    netdata_configured_cache_dir   = config_get("global", "cache directory",     CACHE_DIR);
+    netdata_configured_varlib_dir  = config_get("global", "lib directory",       VARLIB_DIR);
+    netdata_configured_home_dir    = config_get("global", "home directory",      CACHE_DIR);
+}
+
 int main(int argc, char **argv) {
     char *hostname = "localhost";
     int i, check_config = 0;
@@ -464,6 +474,10 @@ int main(int argc, char **argv) {
                         char* debug_flags_string = "debug_flags=";
                         if(strcmp(optarg, "unittest") == 0) {
                             default_rrd_update_every = 1;
+                            if(!config_loaded) load_config(NULL, 0);
+                            get_netdata_configured_directories();
+                            registry_init();
+                            rrd_init("unittest");
                             if(run_all_mockup_tests()) exit(1);
                             if(unit_test_storage()) exit(1);
                             fprintf(stderr, "\n\nALL TESTS PASSED\n\n");
@@ -555,13 +569,7 @@ int main(int argc, char **argv) {
 
         // prepare configuration environment variables for the plugins
 
-        netdata_configured_config_dir  = config_get("global", "config directory",    CONFIG_DIR);
-        netdata_configured_log_dir     = config_get("global", "log directory",       LOG_DIR);
-        netdata_configured_plugins_dir = config_get("global", "plugins directory",   PLUGINS_DIR);
-        netdata_configured_web_dir     = config_get("global", "web files directory", WEB_DIR);
-        netdata_configured_cache_dir   = config_get("global", "cache directory",     CACHE_DIR);
-        netdata_configured_varlib_dir  = config_get("global", "lib directory",       VARLIB_DIR);
-        netdata_configured_home_dir    = config_get("global", "home directory",      CACHE_DIR);
+        get_netdata_configured_directories();
 
         setenv("NETDATA_CONFIG_DIR" , verify_required_directory(netdata_configured_config_dir),  1);
         setenv("NETDATA_PLUGINS_DIR", verify_required_directory(netdata_configured_plugins_dir), 1);

diff --git a/src/rrdset.c b/src/rrdset.c
index 5efc1ce3a116773a1a782910818e5d7d75d7b78a..3432788b941c80200c18f69f9d03eb17e71a0dfb 100644 (file)
--- a/src/rrdset.c
+++ b/src/rrdset.c
@@ -495,16 +495,23 @@ RRDSET *rrdset_create(RRDHOST *host, const char *type, const char *id, const cha
 // ----------------------------------------------------------------------------
 // RRDSET - data collection iteration control
 
-void rrdset_next_usec_unfiltered(RRDSET *st, usec_t microseconds) {
-    if(unlikely(!st->last_collected_time.tv_sec || !microseconds)) {
+inline void rrdset_next_usec_unfiltered(RRDSET *st, usec_t microseconds) {
+
+    if(unlikely(!st->last_collected_time.tv_sec)) {
         // the first entry
         microseconds = st->update_every * USEC_PER_SEC;
     }
+    else if(unlikely(!microseconds)) {
+        // no dt given by the plugin
+        struct timeval now;
+        now_realtime_timeval(&now);
+        microseconds = dt_usec(&now, &st->last_collected_time);
+    }
+
     st->usec_since_last_update = microseconds;
 }
 
-void rrdset_next_usec(RRDSET *st, usec_t microseconds)
-{
+inline void rrdset_next_usec(RRDSET *st, usec_t microseconds) {
     struct timeval now;
     now_realtime_timeval(&now);
 
@@ -556,10 +563,46 @@ void rrdset_next_usec(RRDSET *st, usec_t microseconds)
 // ----------------------------------------------------------------------------
 // RRDSET - process the collected values for all dimensions of a chart
 
+static inline void rrdset_init_last_collected_time(RRDSET *st) {
+    now_realtime_timeval(&st->last_collected_time);
+    timeval_align(&st->last_collected_time, st->update_every);
+}
+
+static inline usec_t rrdset_update_last_collected_time(RRDSET *st) {
+    usec_t last_collect_ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec;
+    usec_t ut = last_collect_ut + st->usec_since_last_update;
+    st->last_collected_time.tv_sec = (time_t) (ut / USEC_PER_SEC);
+    st->last_collected_time.tv_usec = (suseconds_t) (ut % USEC_PER_SEC);
+    return last_collect_ut;
+}
+
+static inline void rrdset_init_last_updated_time(RRDSET *st) {
+    // copy the last collected time to last updated time
+    memcpy(&st->last_updated, &st->last_collected_time, sizeof(struct timeval));
+    timeval_align(&st->last_updated, st->update_every);
+    st->last_updated.tv_usec = 0;
+}
+
+static inline void rrdset_done_push_int(RRDSET *st) {
+    if(unlikely(!st->last_collected_time.tv_sec)) {
+        // it is the first entry
+        // set the last_collected_time to now
+        rrdset_init_last_collected_time(st);
+    }
+    else {
+        // it is not the first entry
+        // calculate the proper last_collected_time, using usec_since_last_update
+        rrdset_update_last_collected_time(st);
+    }
+
+    rrdset_done_push(st);
+}
+
 void rrdset_done(RRDSET *st) {
     if(unlikely(netdata_exit)) return;
+
     if(unlikely(central_netdata_to_push_data)) {
-        rrdset_done_push(st);
+        rrdset_done_push_int(st);
         return;
     }
 
@@ -611,8 +654,7 @@ void rrdset_done(RRDSET *st) {
     if(unlikely(!st->last_collected_time.tv_sec)) {
         // it is the first entry
         // set the last_collected_time to now
-        now_realtime_timeval(&st->last_collected_time);
-        timeval_align(&st->last_collected_time, st->update_every);
+        rrdset_init_last_collected_time(st);
 
         last_collect_ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec - update_every_ut;
 
@@ -626,10 +668,7 @@ void rrdset_done(RRDSET *st) {
     else {
         // it is not the first entry
         // calculate the proper last_collected_time, using usec_since_last_update
-        last_collect_ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec;
-        usec_t ut = last_collect_ut + st->usec_since_last_update;
-        st->last_collected_time.tv_sec = (time_t) (ut / USEC_PER_SEC);
-        st->last_collected_time.tv_usec = (suseconds_t) (ut % USEC_PER_SEC);
+        last_collect_ut = rrdset_update_last_collected_time(st);
     }
 
     // if this set has not been updated in the past
@@ -637,32 +676,24 @@ void rrdset_done(RRDSET *st) {
     if(unlikely(!st->last_updated.tv_sec)) {
         // it has never been updated before
         // set a fake last_updated, in the past using usec_since_last_update
-        usec_t ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec - st->usec_since_last_update;
-        st->last_updated.tv_sec = (time_t) (ut / USEC_PER_SEC);
-        st->last_updated.tv_usec = (suseconds_t) (ut % USEC_PER_SEC);
+        rrdset_init_last_updated_time(st);
 
         // the first entry should not be stored
         store_this_entry = 0;
         first_entry = 1;
 
         if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
-            debug(D_RRD_STATS, "%s: initializing last_updated to now - %llu microseconds (%0.3Lf). Will not store the next entry.", st->name, st->usec_since_last_update, (long double)ut/1000000.0);
+            debug(D_RRD_STATS, "%s: initializing last_updated to last_collected_time - %llu microseconds. Will not store the next entry.", st->name, st->usec_since_last_update);
     }
 
     // check if we will re-write the entire data set
     if(unlikely(dt_usec(&st->last_collected_time, &st->last_updated) > st->entries * update_every_ut)) {
         info("%s: too old data (last updated at %ld.%ld, last collected at %ld.%ld). Resetting it. Will not store the next entry.", st->name, st->last_updated.tv_sec, st->last_updated.tv_usec, st->last_collected_time.tv_sec, st->last_collected_time.tv_usec);
         rrdset_reset(st);
+        rrdset_init_last_updated_time(st);
 
         st->usec_since_last_update = update_every_ut;
 
-        now_realtime_timeval(&st->last_collected_time);
-        timeval_align(&st->last_collected_time, st->update_every);
-
-        usec_t ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec - st->usec_since_last_update;
-        st->last_updated.tv_sec = (time_t) (ut / USEC_PER_SEC);
-        st->last_updated.tv_usec = (suseconds_t) (ut % USEC_PER_SEC);
-
         // the first entry should not be stored
         store_this_entry = 0;
         first_entry = 1;