]> arthur.barton.de Git - netdata.git/blobdiff - src/plugin_checks.c
Merge pull request #1998 from ktsaou/master
[netdata.git] / src / plugin_checks.c
index 217cdc512ef03e9659c50f1dbc7c98fd0e0f3593..3a0a83bda278f9b0f9b6c07d7c9d140a510ea673 100644 (file)
@@ -1,84 +1,89 @@
 #include "common.h"
 
-void *checks_main(void *ptr)
-{
-       if(ptr) { ; }
+void *checks_main(void *ptr) {
+    struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
 
-       info("CHECKS thread created with task id %d", gettid());
+    info("CHECKS thread created with task id %d", gettid());
 
-       if(pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL) != 0)
-               error("Cannot set pthread cancel type to DEFERRED.");
+    if(pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL) != 0)
+        error("Cannot set pthread cancel type to DEFERRED.");
 
-       if(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
-               error("Cannot set pthread cancel state to ENABLE.");
+    if(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
+        error("Cannot set pthread cancel state to ENABLE.");
 
-       unsigned long long usec = 0, susec = rrd_update_every * 1000000ULL, loop_usec = 0, total_susec = 0;
-       struct timeval now, last, loop;
+    usec_t usec = 0, susec = localhost->rrd_update_every * USEC_PER_SEC, loop_usec = 0, total_susec = 0;
+    struct timeval now, last, loop;
 
-       RRDSET *check1, *check2, *check3, *apps_cpu = NULL;
+    RRDSET *check1, *check2, *check3, *apps_cpu = NULL;
 
-       check1 = rrdset_create("netdata", "check1", NULL, "netdata", NULL, "Caller gives microseconds", "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
-       rrddim_add(check1, "absolute", NULL, -1, 1, RRDDIM_ABSOLUTE);
-       rrddim_add(check1, "incremental", NULL, 1, 1, RRDDIM_INCREMENTAL);
+    check1 = rrdset_create_localhost("netdata", "check1", NULL, "netdata", NULL, "Caller gives microseconds"
+                                     , "a million !", 99999, localhost->rrd_update_every, RRDSET_TYPE_LINE);
+    rrddim_add(check1, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
+    rrddim_add(check1, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
 
-       check2 = rrdset_create("netdata", "check2", NULL, "netdata", NULL, "Netdata calcs microseconds", "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
-       rrddim_add(check2, "absolute", NULL, -1, 1, RRDDIM_ABSOLUTE);
-       rrddim_add(check2, "incremental", NULL, 1, 1, RRDDIM_INCREMENTAL);
+    check2 = rrdset_create_localhost("netdata", "check2", NULL, "netdata", NULL, "Netdata calcs microseconds"
+                                     , "a million !", 99999, localhost->rrd_update_every, RRDSET_TYPE_LINE);
+    rrddim_add(check2, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
+    rrddim_add(check2, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
 
-       check3 = rrdset_create("netdata", "checkdt", NULL, "netdata", NULL, "Clock difference", "microseconds diff", 99999, rrd_update_every, RRDSET_TYPE_LINE);
-       rrddim_add(check3, "caller", NULL, 1, 1, RRDDIM_ABSOLUTE);
-       rrddim_add(check3, "netdata", NULL, 1, 1, RRDDIM_ABSOLUTE);
-       rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRDDIM_ABSOLUTE);
+    check3 = rrdset_create_localhost("netdata", "checkdt", NULL, "netdata", NULL, "Clock difference"
+                                     , "microseconds diff", 99999, localhost->rrd_update_every, RRDSET_TYPE_LINE);
+    rrddim_add(check3, "caller", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+    rrddim_add(check3, "netdata", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
+    rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
 
-       gettimeofday(&last, NULL);
-       while(1) {
-               usleep(susec);
+    now_realtime_timeval(&last);
+    while(1) {
+        usleep(susec);
 
-               // find the time to sleep in order to wait exactly update_every seconds
-               gettimeofday(&now, NULL);
-               loop_usec = usecdiff(&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);
+        // find the time to sleep in order to wait exactly update_every seconds
+        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);
 
-               if(usec < (rrd_update_every * 1000000ULL / 2ULL)) susec = (rrd_update_every * 1000000ULL) - usec;
-               else susec = rrd_update_every * 1000000ULL / 2ULL;
+        if(usec < (localhost->rrd_update_every * USEC_PER_SEC / 2ULL)) susec = (localhost->rrd_update_every * USEC_PER_SEC) - usec;
+        else susec = localhost->rrd_update_every * USEC_PER_SEC / 2ULL;
 
-               // --------------------------------------------------------------------
-               // Calculate loop time
+        // --------------------------------------------------------------------
+        // Calculate loop time
 
-               last.tv_sec = now.tv_sec;
-               last.tv_usec = now.tv_usec;
-               total_susec += loop_usec;
+        last.tv_sec = now.tv_sec;
+        last.tv_usec = now.tv_usec;
+        total_susec += loop_usec;
 
-               // --------------------------------------------------------------------
-               // check chart 1
+        // --------------------------------------------------------------------
+        // check chart 1
 
-               if(check1->counter_done) rrdset_next_usec(check1, loop_usec);
-               rrddim_set(check1, "absolute", 1000000);
-               rrddim_set(check1, "incremental", total_susec);
-               rrdset_done(check1);
+        if(check1->counter_done) rrdset_next_usec(check1, loop_usec);
+        rrddim_set(check1, "absolute", 1000000);
+        rrddim_set(check1, "incremental", total_susec);
+        rrdset_done(check1);
 
-               // --------------------------------------------------------------------
-               // check chart 2
+        // --------------------------------------------------------------------
+        // check chart 2
 
-               if(check2->counter_done) rrdset_next(check2);
-               rrddim_set(check2, "absolute", 1000000);
-               rrddim_set(check2, "incremental", total_susec);
-               rrdset_done(check2);
+        if(check2->counter_done) rrdset_next(check2);
+        rrddim_set(check2, "absolute", 1000000);
+        rrddim_set(check2, "incremental", total_susec);
+        rrdset_done(check2);
 
-               // --------------------------------------------------------------------
-               // check chart 3
+        // --------------------------------------------------------------------
+        // check chart 3
 
-               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)usecdiff(&loop, &check1->last_collected_time));
-               rrddim_set(check3, "netdata", (long long)usecdiff(&loop, &check2->last_collected_time));
-               if(apps_cpu) rrddim_set(check3, "apps.plugin", (long long)usecdiff(&loop, &apps_cpu->last_collected_time));
-               rrdset_done(check3);
-       }
+        if(!apps_cpu) apps_cpu = rrdset_find_localhost("apps.cpu");
+        if(check3->counter_done) rrdset_next_usec(check3, loop_usec);
+        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));
+        rrdset_done(check3);
+    }
 
-       pthread_exit(NULL);
-       return NULL;
+    info("CHECKS thread exiting");
+
+    static_thread->enabled = 0;
+    pthread_exit(NULL);
+    return NULL;
 }