replace `usec_dt()` calls by `dt_usec()`

Signed-off-by: Rémi Lefèvre <remi.lefevre@parrot.com>

diff --git a/src/apps_plugin.c b/src/apps_plugin.c
index 26811656c91e19832b358571f5ed6393891d0969..4b0b8008d27574f7fb341bdbbb915bde79812e78 100644 (file)
--- a/src/apps_plugin.c
+++ b/src/apps_plugin.c
@@ -2173,7 +2173,7 @@ unsigned long long send_resource_usage_to_netdata() {
         gettimeofday(&now, NULL);
         getrusage(RUSAGE_SELF, &me);
 
-        usec = usec_dt(&now, &last);
+        usec = dt_usec(&now, &last);
         cpuuser = me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec;
         cpusyst = me.ru_stime.tv_sec * 1000000ULL + me.ru_stime.tv_usec;
 

diff --git a/src/common.c b/src/common.c
index 52e48fea2b388b22a5aee2ef81b65adc38d39f8e..88c4ecf2ed9e9d464a133e5b9dab38d15650a445 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -207,12 +207,6 @@ inline unsigned long long time_usec(void) {
     return timeval_usec(&now);
 }
 
-inline unsigned long long usec_dt(struct timeval *now, struct timeval *old) {
-    unsigned long long tv1 = timeval_usec(now);
-    unsigned long long tv2 = timeval_usec(old);
-    return (tv1 > tv2) ? (tv1 - tv2) : (tv2 - tv1);
-}
-
 int sleep_usec(unsigned long long usec) {
 
 #ifndef NETDATA_WITH_USLEEP

diff --git a/src/common.h b/src/common.h
index 582149fb9273dbfa4f459ae67fa0aafbcf241b5c..c2a26ee417cd332f02ef8aacaac61acb0ab8518f 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -146,10 +146,6 @@
 #endif
 #define abs(x) ((x < 0)? -x : x)
 
-extern unsigned long long usec_dt(struct timeval *now, struct timeval *old);
-
-// #define usec_dt(now, last) (((((now)->tv_sec * 1000000ULL) + (now)->tv_usec) - (((last)->tv_sec * 1000000ULL) + (last)->tv_usec)))
-
 extern void netdata_fix_chart_id(char *s);
 extern void netdata_fix_chart_name(char *s);
 

diff --git a/src/plugin_checks.c b/src/plugin_checks.c
index 007d6565fa30b6d5cd1563c66d3b759ea47b18cb..172638f8d9bc3c0746162b4b1025bf7833f60d09 100644 (file)
--- a/src/plugin_checks.c
+++ b/src/plugin_checks.c
@@ -36,7 +36,7 @@ void *checks_main(void *ptr)
 
         // find the time to sleep in order to wait exactly update_every seconds
         gettimeofday(&now, NULL);
-        loop_usec = usec_dt(&now, &last);
+        loop_usec = dt_usec(&now, &last);
         usec = loop_usec - susec;
         debug(D_PROCNETDEV_LOOP, "CHECK: last loop took %llu usec (worked for %llu, sleeped for %llu).", loop_usec, usec, susec);
 
@@ -72,9 +72,9 @@ void *checks_main(void *ptr)
         if(!apps_cpu) apps_cpu = rrdset_find("apps.cpu");
         if(check3->counter_done) rrdset_next_usec(check3, loop_usec);
         gettimeofday(&loop, NULL);
-        rrddim_set(check3, "caller", (long long) usec_dt(&loop, &check1->last_collected_time));
-        rrddim_set(check3, "netdata", (long long) usec_dt(&loop, &check2->last_collected_time));
-        if(apps_cpu) rrddim_set(check3, "apps.plugin", (long long) usec_dt(&loop, &apps_cpu->last_collected_time));
+        rrddim_set(check3, "caller", (long long) dt_usec(&loop, &check1->last_collected_time));
+        rrddim_set(check3, "netdata", (long long) dt_usec(&loop, &check2->last_collected_time));
+        if(apps_cpu) rrddim_set(check3, "apps.plugin", (long long) dt_usec(&loop, &apps_cpu->last_collected_time));
         rrdset_done(check3);
     }
 

diff --git a/src/plugin_idlejitter.c b/src/plugin_idlejitter.c
index a9b340ab00897637b7f047f1c3e3c832b55f4059..e8f1d6fb9c660839aa88a7b397f6f11a0ea865ed 100644 (file)
--- a/src/plugin_idlejitter.c
+++ b/src/plugin_idlejitter.c
@@ -38,7 +38,7 @@ void *cpuidlejitter_main(void *ptr)
             gettimeofday(&after, NULL);
 
             // calculate the time it took for a full loop
-            usec = usec_dt(&after, &before);
+            usec = dt_usec(&after, &before);
             susec += usec;
         }
         usec -= (sleep_ms * 1000);

diff --git a/src/plugin_nfacct.c b/src/plugin_nfacct.c
index b258005ba05440ec70c12e49a81a7d82a8e2155a..a2e3164e7d5b5d95b4a81f616eea0396367a55d2 100644 (file)
--- a/src/plugin_nfacct.c
+++ b/src/plugin_nfacct.c
@@ -132,7 +132,7 @@ void *nfacct_main(void *ptr) {
         // --------------------------------------------------------------------
 
         gettimeofday(&now, NULL);
-        usec = usec_dt(&now, &last) - susec;
+        usec = dt_usec(&now, &last) - susec;
         debug(D_NFACCT_LOOP, "nfacct.plugin: last loop took %llu usec (worked for %llu, sleeped for %llu).", usec + susec, usec, susec);
 
         if(usec < (rrd_update_every * 1000000ULL / 2ULL)) susec = (rrd_update_every * 1000000ULL) - usec;

diff --git a/src/plugins_d.c b/src/plugins_d.c
index e7197c30617cf859793a076d41f06594f27a2820..ed7acabea8f202b8da7a70355282bb74229aad3f 100644 (file)
--- a/src/plugins_d.c
+++ b/src/plugins_d.c
@@ -348,7 +348,7 @@ void *pluginsd_worker_thread(void *arg)
                 }
                 else {
                     // second+ run
-                    usec = usec_dt(&now, &last) - susec;
+                    usec = dt_usec(&now, &last) - susec;
                     error("PLUGINSD: %s last loop took %llu usec (worked for %llu, sleeped for %llu).\n", cd->fullfilename, usec + susec, usec, susec);
                     if(unlikely(usec < (rrd_update_every * 1000000ULL / 2ULL))) susec = (rrd_update_every * 1000000ULL) - usec;
                     else susec = rrd_update_every * 1000000ULL / 2ULL;

diff --git a/src/rrd.c b/src/rrd.c
index 1a2d307d39a2fd87747735e842145a320fdc39f0..304030b9a5773dd7f4a245a70a01c12ba5b1f2fd 100644 (file)
--- a/src/rrd.c
+++ b/src/rrd.c
@@ -685,7 +685,7 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier
             error("File %s does not have the same refresh frequency. Clearing it.", fullfilename);
             memset(rd, 0, size);
         }
-        else if(usec_dt(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * 1000000ULL)) {
+        else if(dt_usec(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * 1000000ULL)) {
             errno = 0;
             error("File %s is too old. Clearing it.", fullfilename);
             memset(rd, 0, size);
@@ -1018,13 +1018,13 @@ void rrdset_next_usec(RRDSET *st, unsigned long long microseconds)
     }
     else if(unlikely(!microseconds)) {
         // no dt given by the plugin
-        microseconds = usec_dt(&now, &st->last_collected_time);
+        microseconds = dt_usec(&now, &st->last_collected_time);
     }
     else {
         // microseconds has the time since the last collection
         unsigned long long now_usec = timeval_usec(&now);
         unsigned long long last_usec = timeval_usec(&st->last_collected_time);
-        unsigned long long since_last_usec = usec_dt(&now, &st->last_collected_time);
+        unsigned long long since_last_usec = dt_usec(&now, &st->last_collected_time);
 
         // verify the microseconds given is good
         if(unlikely(microseconds > since_last_usec)) {
@@ -1139,7 +1139,7 @@ unsigned long long rrdset_done(RRDSET *st)
     }
 
     // check if we will re-write the entire data set
-    if(unlikely(usec_dt(&st->last_collected_time, &st->last_updated) > st->entries * update_every_ut)) {
+    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). Reseting 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);
 

diff --git a/src/web_client.c b/src/web_client.c
index b36af6332085d08eefa03949bba99edd49fe0d4c..447ccf629da566bb0deeb02b73133298fad5040a 100644 (file)
--- a/src/web_client.c
+++ b/src/web_client.c
@@ -136,7 +136,7 @@ void web_client_reset(struct web_client *w) {
         // --------------------------------------------------------------------
         // global statistics
 
-        finished_web_request_statistics(usec_dt(&tv, &w->tv_in),
+        finished_web_request_statistics(dt_usec(&tv, &w->tv_in),
                                         w->stats_received_bytes,
                                         w->stats_sent_bytes,
                                         size,
@@ -152,9 +152,9 @@ void web_client_reset(struct web_client *w) {
         log_access("%llu: (sent/all = %zu/%zu bytes %0.0f%%, prep/sent/total = %0.2f/%0.2f/%0.2f ms) %s: %d '%s'",
                    w->id,
                    sent, size, -((size > 0) ? ((size - sent) / (double) size * 100.0) : 0.0),
-                   usec_dt(&w->tv_ready, &w->tv_in) / 1000.0,
-                   usec_dt(&tv, &w->tv_ready) / 1000.0,
-                   usec_dt(&tv, &w->tv_in) / 1000.0,
+                   dt_usec(&w->tv_ready, &w->tv_in) / 1000.0,
+                   dt_usec(&tv, &w->tv_ready) / 1000.0,
+                   dt_usec(&tv, &w->tv_in) / 1000.0,
                    (w->mode == WEB_CLIENT_MODE_FILECOPY) ? "filecopy" : ((w->mode == WEB_CLIENT_MODE_OPTIONS)
                                                                          ? "options" : "data"),
                    w->response.code,