Merge pull request #1672 from ktsaou/master

[netdata.git] / src / plugin_macos.c

diff --git a/src/plugin_macos.c b/src/plugin_macos.c
index 9f88d1e2e6ca8ada0d44c645b100ee5bcffc7d90..cf4f740266caf443a746648e41064fd3d307f073 100644 (file)
--- a/src/plugin_macos.c
+++ b/src/plugin_macos.c
@@ -1,8 +1,7 @@
 #include "common.h"
 
-void *macos_main(void *ptr)
-{
-    (void)ptr;
+void *macos_main(void *ptr) {
+    struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
 
     info("MACOS Plugin thread created with task id %d", gettid());
 
@@ -30,14 +29,10 @@ void *macos_main(void *ptr)
     unsigned long long sutime_macos_iokit = 0ULL;
 
     usec_t step = rrd_update_every * USEC_PER_SEC;
+    heartbeat_t hb;
+    heartbeat_init(&hb);
     for(;;) {
-        usec_t now = now_realtime_usec();
-        usec_t next = now - (now % step) + step;
-
-        while(now < next) {
-            sleep_usec(next - now);
-            now = now_realtime_usec();
-        }
+        usec_t hb_dt = heartbeat_next(&hb, step);
 
         if(unlikely(netdata_exit)) break;
 
@@ -45,25 +40,19 @@ void *macos_main(void *ptr)
 
         if(!vdo_macos_sysctl) {
             debug(D_PROCNETDEV_LOOP, "MACOS: calling do_macos_sysctl().");
-            now = now_realtime_usec();
-            vdo_macos_sysctl = do_macos_sysctl(rrd_update_every, (sutime_macos_sysctl > 0)?now - sutime_macos_sysctl:0ULL);
-            sutime_macos_sysctl = now;
+            vdo_macos_sysctl = do_macos_sysctl(rrd_update_every, hb_dt);
         }
         if(unlikely(netdata_exit)) break;
 
         if(!vdo_macos_mach_smi) {
             debug(D_PROCNETDEV_LOOP, "MACOS: calling do_macos_mach_smi().");
-            now = now_realtime_usec();
-            vdo_macos_mach_smi = do_macos_mach_smi(rrd_update_every, (sutime_macos_mach_smi > 0)?now - sutime_macos_mach_smi:0ULL);
-            sutime_macos_mach_smi = now;
+            vdo_macos_mach_smi = do_macos_mach_smi(rrd_update_every, hb_dt);
         }
         if(unlikely(netdata_exit)) break;
 
         if(!vdo_macos_iokit) {
             debug(D_PROCNETDEV_LOOP, "MACOS: calling do_macos_iokit().");
-            now = now_realtime_usec();
-            vdo_macos_iokit = do_macos_iokit(rrd_update_every, (sutime_macos_iokit > 0)?now - sutime_macos_iokit:0ULL);
-            sutime_macos_iokit = now;
+            vdo_macos_iokit = do_macos_iokit(rrd_update_every, hb_dt);
         }
         if(unlikely(netdata_exit)) break;
 
@@ -79,6 +68,7 @@ void *macos_main(void *ptr)
 
     info("MACOS thread exiting");
 
+    static_thread->enabled = 0;
     pthread_exit(NULL);
     return NULL;
 }