fixed minor issues throughout the code (mainly types); dashboard has now a watermark...

[netdata.git] / src / plugin_proc.c

diff --git a/src/plugin_proc.c b/src/plugin_proc.c
index 40ec38aab647c0a3b393353a5d0a6b057ff89013..656ac1738fb928feb9b2cde2f77436bad540061c 100755 (executable)
--- a/src/plugin_proc.c
+++ b/src/plugin_proc.c
@@ -49,6 +49,8 @@ void *proc_main(void *ptr)
        int vdo_proc_net_rpc_nfsd               = !config_get_boolean("plugin:proc", "/proc/net/rpc/nfsd", 1);
        int vdo_proc_sys_kernel_random_entropy_avail    = !config_get_boolean("plugin:proc", "/proc/sys/kernel/random/entropy_avail", 1);
        int vdo_proc_interrupts                 = !config_get_boolean("plugin:proc", "/proc/interrupts", 1);
+       int vdo_proc_softirqs                   = !config_get_boolean("plugin:proc", "/proc/softirqs", 1);
+       int vdo_sys_kernel_mm_ksm               = !config_get_boolean("plugin:proc", "/sys/kernel/mm/ksm", 1);
        int vdo_cpu_netdata                     = !config_get_boolean("plugin:proc", "netdata server resources", 1);
 
        RRDSET *stcpu = NULL, *stcpu_thread = NULL, *stclients = NULL, *streqs = NULL, *stbytes = NULL;
@@ -60,10 +62,19 @@ void *proc_main(void *ptr)
 
                // BEGIN -- the job to be done
 
+               if(!vdo_sys_kernel_mm_ksm) {
+                       debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_sys_kernel_mm_ksm().");
+                       vdo_sys_kernel_mm_ksm = do_sys_kernel_mm_ksm(rrd_update_every, usec+susec);
+               }
+
                if(!vdo_proc_interrupts) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_interrupts().");
                        vdo_proc_interrupts = do_proc_interrupts(rrd_update_every, usec+susec);
                }
+               if(!vdo_proc_softirqs) {
+                       debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_softirqs().");
+                       vdo_proc_softirqs = do_proc_softirqs(rrd_update_every, usec+susec);
+               }
                if(!vdo_proc_sys_kernel_random_entropy_avail) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_sys_kernel_random_entropy_avail().");
                        vdo_proc_sys_kernel_random_entropy_avail = do_proc_sys_kernel_random_entropy_avail(rrd_update_every, usec+susec);
@@ -202,7 +213,7 @@ void *proc_main(void *ptr)
                        rrdset_done(stbytes);
                }
 
-               usleep(susec);
+               usleep((useconds_t) susec);
 
                // copy current to last
                bcopy(&now, &last, sizeof(struct timeval));