X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fplugin_macos.c;h=4e84a084d69f3136a068756f6bacf6a98e7e2a9f;hb=43dac616e9d146a886b9c9c81711ed4d3d852a58;hp=2f3a9cf453ab195eb343fee8eab314bddc05d758;hpb=ee5cd2f39ed9f839e6ebcd83db98390d9f8b91d1;p=netdata.git

diff --git a/src/plugin_macos.c b/src/plugin_macos.c
index 2f3a9cf4..4e84a084 100644
--- 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());
 
@@ -12,30 +11,22 @@ void *macos_main(void *ptr)
     if(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
         error("Cannot set pthread cancel state to ENABLE.");
 
-    // disable (by default) various interface that are not needed
-    /*
-    config_get_boolean("plugin:proc:/proc/net/dev:lo", "enabled", 0);
-    config_get_boolean("plugin:proc:/proc/net/dev:fireqos_monitor", "enabled", 0);
-    */
-
     // when ZERO, attempt to do it
     int vdo_cpu_netdata             = !config_get_boolean("plugin:macos", "netdata server resources", 1);
     int vdo_macos_sysctl            = !config_get_boolean("plugin:macos", "sysctl", 1);
     int vdo_macos_mach_smi          = !config_get_boolean("plugin:macos", "mach system management interface", 1);
+    int vdo_macos_iokit             = !config_get_boolean("plugin:macos", "iokit", 1);
 
     // keep track of the time each module was called
     unsigned long long sutime_macos_sysctl = 0ULL;
     unsigned long long sutime_macos_mach_smi = 0ULL;
+    unsigned long long sutime_macos_iokit = 0ULL;
 
-    usec_t step = rrd_update_every * USEC_PER_SEC;
+    usec_t step = localhost->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;
 
@@ -43,17 +34,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(localhost->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(localhost->rrd_update_every, hb_dt);
+        }
+        if(unlikely(netdata_exit)) break;
+
+        if(!vdo_macos_iokit) {
+            debug(D_PROCNETDEV_LOOP, "MACOS: calling do_macos_iokit().");
+            vdo_macos_iokit = do_macos_iokit(localhost->rrd_update_every, hb_dt);
         }
         if(unlikely(netdata_exit)) break;
 
@@ -69,6 +62,7 @@ void *macos_main(void *ptr)
 
     info("MACOS thread exiting");
 
+    static_thread->enabled = 0;
     pthread_exit(NULL);
     return NULL;
 }