]> arthur.barton.de Git - netdata.git/commitdiff
replace `gettimeofday()` calls by `now_realtime_timeval()`
authorRémi Lefèvre <remi.lefevre@parrot.com>
Fri, 9 Dec 2016 08:53:35 +0000 (09:53 +0100)
committerRémi Lefèvre <remi.lefevre@parrot.com>
Sun, 11 Dec 2016 10:51:58 +0000 (11:51 +0100)
Signed-off-by: Rémi Lefèvre <remi.lefevre@parrot.com>
src/apps_plugin.c
src/plugin_checks.c
src/plugin_idlejitter.c
src/plugin_nfacct.c
src/plugins_d.c
src/rrd.c
src/unit_test.c
src/web_client.c

index 1e6f546f629c01c6ecb3fc256e25dccb5e88d8ff..0247bb90b059204cde48f6279bd5e5de153ba3a7 100644 (file)
@@ -2159,7 +2159,7 @@ unsigned long long send_resource_usage_to_netdata() {
     unsigned long long cpusyst;
 
     if(!last.tv_sec) {
-        gettimeofday(&last, NULL);
+        now_realtime_timeval(&last);
         getrusage(RUSAGE_SELF, &me_last);
 
         // the first time, give a zero to allow
@@ -2170,7 +2170,7 @@ unsigned long long send_resource_usage_to_netdata() {
         cpusyst = 0;
     }
     else {
-        gettimeofday(&now, NULL);
+        now_realtime_timeval(&now);
         getrusage(RUSAGE_SELF, &me);
 
         usec = dt_usec(&now, &last);
index 172638f8d9bc3c0746162b4b1025bf7833f60d09..18b1d1684a56663e2a061d8274317c9922ca46bc 100644 (file)
@@ -30,12 +30,12 @@ void *checks_main(void *ptr)
     rrddim_add(check3, "netdata", NULL, 1, 1, RRDDIM_ABSOLUTE);
     rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRDDIM_ABSOLUTE);
 
-    gettimeofday(&last, NULL);
+    now_realtime_timeval(&last);
     while(1) {
         usleep(susec);
 
         // find the time to sleep in order to wait exactly update_every seconds
-        gettimeofday(&now, NULL);
+        now_realtime_timeval(&now);
         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);
@@ -71,7 +71,7 @@ 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);
+        now_realtime_timeval(&loop);
         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));
index e8f1d6fb9c660839aa88a7b397f6f11a0ea865ed..b1273f001cd4a8bb693967d73bcbb85edffb1f1e 100644 (file)
@@ -33,9 +33,9 @@ void *cpuidlejitter_main(void *ptr)
 
         while(susec < (rrd_update_every * 1000000ULL)) {
 
-            gettimeofday(&before, NULL);
+            now_realtime_timeval(&before);
             sleep_usec(sleep_ms * 1000);
-            gettimeofday(&after, NULL);
+            now_realtime_timeval(&after);
 
             // calculate the time it took for a full loop
             usec = dt_usec(&after, &before);
index a2e3164e7d5b5d95b4a81f616eea0396367a55d2..72ecc7b3673444a9ad2a43b64b8de627c8a309a7 100644 (file)
@@ -93,7 +93,7 @@ void *nfacct_main(void *ptr) {
     unsigned long long usec = 0, susec = 0;
     RRDSET *st = NULL;
 
-    gettimeofday(&last, NULL);
+    now_realtime_timeval(&last);
 
     // ------------------------------------------------------------------------
 
@@ -131,7 +131,7 @@ void *nfacct_main(void *ptr) {
 
         // --------------------------------------------------------------------
 
-        gettimeofday(&now, NULL);
+        now_realtime_timeval(&now);
         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);
 
index ed7acabea8f202b8da7a70355282bb74229aad3f..d1784ba691b0b5e6589224ad6bee528fe1c72033 100644 (file)
@@ -341,7 +341,7 @@ void *pluginsd_worker_thread(void *arg)
             else if(likely(hash == STOPPING_WAKE_ME_UP_PLEASE_HASH && !strcmp(s, "STOPPING_WAKE_ME_UP_PLEASE"))) {
                 error("PLUGINSD: '%s' (pid %d) called STOPPING_WAKE_ME_UP_PLEASE.", cd->fullfilename, cd->pid);
 
-                gettimeofday(&now, NULL);
+                now_realtime_timeval(&now);
                 if(unlikely(!usec && !susec)) {
                     // our first run
                     susec = cd->rrd_update_every * 1000000ULL;
index 304030b9a5773dd7f4a245a70a01c12ba5b1f2fd..a03110eb148da3f4f1b58b2da18e72f82a9fb969 100644 (file)
--- a/src/rrd.c
+++ b/src/rrd.c
@@ -653,7 +653,7 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier
     if(rrd_memory_mode != RRD_MEMORY_MODE_RAM) rd = (RRDDIM *)mymmap(fullfilename, size, ((rrd_memory_mode == RRD_MEMORY_MODE_MAP)?MAP_SHARED:MAP_PRIVATE), 1);
     if(rd) {
         struct timeval now;
-        gettimeofday(&now, NULL);
+        now_realtime_timeval(&now);
 
         if(strcmp(rd->magic, RRDDIMENSION_MAGIC) != 0) {
             errno = 0;
@@ -977,7 +977,7 @@ collected_number rrddim_set_by_pointer(RRDSET *st, RRDDIM *rd, collected_number
 {
     debug(D_RRD_CALLS, "rrddim_set_by_pointer() for chart %s, dimension %s, value " COLLECTED_NUMBER_FORMAT, st->name, rd->name, value);
 
-    gettimeofday(&rd->last_collected_time, NULL);
+    now_realtime_timeval(&rd->last_collected_time);
     rd->collected_value = value;
     rd->updated = 1;
     rd->counter++;
@@ -1010,7 +1010,7 @@ void rrdset_next_usec_unfiltered(RRDSET *st, unsigned long long microseconds)
 void rrdset_next_usec(RRDSET *st, unsigned long long microseconds)
 {
     struct timeval now;
-    gettimeofday(&now, NULL);
+    now_realtime_timeval(&now);
 
     if(unlikely(!st->last_collected_time.tv_sec)) {
         // the first entry
@@ -1102,7 +1102,7 @@ unsigned long long rrdset_done(RRDSET *st)
     if(unlikely(!st->last_collected_time.tv_sec)) {
         // it is the first entry
         // set the last_collected_time to now
-        gettimeofday(&st->last_collected_time, NULL);
+        now_realtime_timeval(&st->last_collected_time);
         timeval_align(&st->last_collected_time, st->update_every);
 
         last_collect_ut = st->last_collected_time.tv_sec * 1000000ULL + st->last_collected_time.tv_usec - update_every_ut;
@@ -1145,7 +1145,7 @@ unsigned long long rrdset_done(RRDSET *st)
 
         st->usec_since_last_update = update_every_ut;
 
-        gettimeofday(&st->last_collected_time, NULL);
+        now_realtime_timeval(&st->last_collected_time);
         timeval_align(&st->last_collected_time, st->update_every);
 
         unsigned long long ut = st->last_collected_time.tv_sec * 1000000ULL + st->last_collected_time.tv_usec - st->usec_since_last_update;
index 3c99b3e84b79f9155e0844282109aebf0990b4af..9be32b3805ae52e292090fe027ec82d55473f2ca 100644 (file)
@@ -1130,7 +1130,7 @@ int unit_test(long delay, long shift)
         if(do_absi) rrddim_set(st, "percentage-of-incremental-row", i);
 
         if(!c) {
-            gettimeofday(&st->last_collected_time, NULL);
+            now_realtime_timeval(&st->last_collected_time);
             st->last_collected_time.tv_usec = shift;
         }
 
index 447ccf629da566bb0deeb02b73133298fad5040a..50779b54af6dbb208bd70d8bd8a3b582d5f1333f 100644 (file)
@@ -125,7 +125,7 @@ void web_client_reset(struct web_client *w) {
 
     if(likely(w->last_url[0])) {
         struct timeval tv;
-        gettimeofday(&tv, NULL);
+        now_realtime_timeval(&tv);
 
         size_t size = (w->mode == WEB_CLIENT_MODE_FILECOPY)?w->response.rlen:w->response.data->len;
         size_t sent = size;
@@ -1953,7 +1953,7 @@ void web_client_process(struct web_client *w) {
 #endif
 
     // start timing us
-    gettimeofday(&w->tv_in, NULL);
+    now_realtime_timeval(&w->tv_in);
 
     if(unlikely(!hash_api)) {
         hash_api = simple_hash("api");
@@ -2165,7 +2165,7 @@ void web_client_process(struct web_client *w) {
         }
     }
 
-    gettimeofday(&w->tv_ready, NULL);
+    now_realtime_timeval(&w->tv_ready);
     w->response.sent = 0;
     w->response.code = code;