Merge pull request #1944 from ktsaou/master

[netdata.git] / src / plugin_freebsd.c

diff --git a/src/plugin_freebsd.c b/src/plugin_freebsd.c
index d6deb7090a69c7f2a426a9357d7e3fd8aa272d06..3490e70edef2f587d758ce0bb1adf61ecb6a77db 100644 (file)
--- a/src/plugin_freebsd.c
+++ b/src/plugin_freebsd.c
@@ -11,12 +11,6 @@ void *freebsd_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:freebsd", "netdata server resources", 1);
     int vdo_freebsd_sysctl          = !config_get_boolean("plugin:freebsd", "sysctl", 1);
@@ -24,7 +18,7 @@ void *freebsd_main(void *ptr) {
     // keep track of the time each module was called
     unsigned long long sutime_freebsd_sysctl = 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(;;) {
@@ -36,7 +30,7 @@ void *freebsd_main(void *ptr) {
 
         if(!vdo_freebsd_sysctl) {
             debug(D_PROCNETDEV_LOOP, "FREEBSD: calling do_freebsd_sysctl().");
-            vdo_freebsd_sysctl = do_freebsd_sysctl(rrd_update_every, hb_dt);
+            vdo_freebsd_sysctl = do_freebsd_sysctl(localhost->rrd_update_every, hb_dt);
         }
         if(unlikely(netdata_exit)) break;
 
@@ -56,18 +50,3 @@ void *freebsd_main(void *ptr) {
     pthread_exit(NULL);
     return NULL;
 }
-
-int getsysctl(const char *name, void *ptr, size_t len)
-{
-    size_t nlen = len;
-
-    if (unlikely(sysctlbyname(name, ptr, &nlen, NULL, 0) == -1)) {
-        error("FREEBSD: sysctl(%s...) failed: %s", name, strerror(errno));
-        return 1;
-    }
-    if (unlikely(nlen != len)) {
-        error("FREEBSD: sysctl(%s...) expected %lu, got %lu", name, (unsigned long)len, (unsigned long)nlen);
-        return 1;
-    }
-    return 0;
-}