]> arthur.barton.de Git - netdata.git/blobdiff - src/plugin_proc.c
minor optimization on proc loops
[netdata.git] / src / plugin_proc.c
old mode 100755 (executable)
new mode 100644 (file)
index 2192dce..b02e483
-#include <pthread.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <strings.h>
-#include <unistd.h>
-
-#include "global_statistics.h"
 #include "common.h"
-#include "config.h"
-#include "log.h"
-#include "rrd.h"
-#include "plugin_proc.h"
-
-void *proc_main(void *ptr)
-{
-       if(ptr) { ; }
-
-       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.");
-
-       struct rusage me, me_last;
-       struct timeval last, now;
-
-       gettimeofday(&last, NULL);
-       last.tv_sec -= update_every;
-       
-       // disable (by default) various interface that are not needed
-       config_get_boolean("plugin:proc:/proc/net/dev", "interface lo", 0);
-       config_get_boolean("plugin:proc:/proc/net/dev", "interface fireqos_monitor", 0);
-
-       // when ZERO, attempt to do it
-       int vdo_proc_net_dev                    = !config_get_boolean("plugin:proc", "/proc/net/dev", 1);
-       int vdo_proc_diskstats                  = !config_get_boolean("plugin:proc", "/proc/diskstats", 1);
-       int vdo_proc_net_snmp                   = !config_get_boolean("plugin:proc", "/proc/net/snmp", 1);
-       int vdo_proc_net_netstat                = !config_get_boolean("plugin:proc", "/proc/net/netstat", 1);
-       int vdo_proc_net_stat_conntrack = !config_get_boolean("plugin:proc", "/proc/net/stat/conntrack", 1);
-       int vdo_proc_net_ip_vs_stats    = !config_get_boolean("plugin:proc", "/proc/net/ip_vs/stats", 1);
-       int vdo_proc_stat                               = !config_get_boolean("plugin:proc", "/proc/stat", 1);
-       int vdo_proc_meminfo                    = !config_get_boolean("plugin:proc", "/proc/meminfo", 1);
-       int vdo_proc_vmstat                     = !config_get_boolean("plugin:proc", "/proc/vmstat", 1);
-       int vdo_cpu_netdata                     = !config_get_boolean("plugin:proc", "netdata server resources", 1);
-
-       RRD_STATS *stcpu = NULL, *stclients = NULL, *streqs = NULL, *stbytes = NULL;
-
-       gettimeofday(&last, NULL);
-       getrusage(RUSAGE_SELF, &me_last);
-
-       unsigned long long usec = 0, susec = 0;
-       for(;1;) {
-               
-               // BEGIN -- the job to be done
-               if(!vdo_proc_net_dev)                           vdo_proc_net_dev                        = do_proc_net_dev(update_every, usec+susec);
-               if(!vdo_proc_diskstats)                         vdo_proc_diskstats                      = do_proc_diskstats(update_every, usec+susec);
-               if(!vdo_proc_net_snmp)                          vdo_proc_net_snmp                       = do_proc_net_snmp(update_every, usec+susec);
-               if(!vdo_proc_net_netstat)                       vdo_proc_net_netstat            = do_proc_net_netstat(update_every, usec+susec);
-               if(!vdo_proc_net_stat_conntrack)        vdo_proc_net_stat_conntrack     = do_proc_net_stat_conntrack(update_every, usec+susec);
-               if(!vdo_proc_net_ip_vs_stats)           vdo_proc_net_ip_vs_stats        = do_proc_net_ip_vs_stats(update_every, usec+susec);
-               if(!vdo_proc_stat)                                      vdo_proc_stat                           = do_proc_stat(update_every, usec+susec);
-               if(!vdo_proc_meminfo)                           vdo_proc_meminfo                        = do_proc_meminfo(update_every, usec+susec);
-               if(!vdo_proc_vmstat)                            vdo_proc_vmstat                         = do_proc_vmstat(update_every, usec+susec);
-               // END -- the job is done
-               
-               // find the time to sleep in order to wait exactly update_every seconds
-               gettimeofday(&now, NULL);
-               usec = usecdiff(&now, &last) - susec;
-               debug(D_PROCNETDEV_LOOP, "PROCNETDEV: last loop took %llu usec (worked for %llu, sleeped for %llu).", usec + susec, usec, susec);
-               
-               if(usec < (update_every * 1000000ULL / 2ULL)) susec = (update_every * 1000000ULL) - usec;
-               else susec = update_every * 1000000ULL / 2ULL;
-               
-               // --------------------------------------------------------------------
-
-               if(!vdo_cpu_netdata && getrusage(RUSAGE_SELF, &me) == 0) {
-               
-                       unsigned long long cpuuser = me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec;
-                       unsigned long long cpusyst = me.ru_stime.tv_sec * 1000000ULL + me.ru_stime.tv_usec;
-
-                       if(!stcpu) stcpu = rrd_stats_find("netdata.server_cpu");
-                       if(!stcpu) {
-                               stcpu = rrd_stats_create("netdata", "server_cpu", NULL, "netdata", "NetData CPU usage", "milliseconds/s", 9999, update_every, CHART_TYPE_STACKED);
-
-                               rrd_stats_dimension_add(stcpu, "user",  NULL,  1, 1000 * update_every, RRD_DIMENSION_INCREMENTAL);
-                               rrd_stats_dimension_add(stcpu, "system", NULL, 1, 1000 * update_every, RRD_DIMENSION_INCREMENTAL);
-                       }
-                       else rrd_stats_next(stcpu);
-
-                       rrd_stats_dimension_set(stcpu, "user", cpuuser);
-                       rrd_stats_dimension_set(stcpu, "system", cpusyst);
-                       rrd_stats_done(stcpu);
-                       
-                       bcopy(&me, &me_last, sizeof(struct rusage));
-
-                       // ----------------------------------------------------------------
-
-                       if(!stclients) stclients = rrd_stats_find("netdata.clients");
-                       if(!stclients) {
-                               stclients = rrd_stats_create("netdata", "clients", NULL, "netdata", "NetData Web Clients", "connected clients", 11000, update_every, CHART_TYPE_LINE);
-
-                               rrd_stats_dimension_add(stclients, "clients",  NULL,  1, 1, RRD_DIMENSION_ABSOLUTE);
-                       }
-                       else rrd_stats_next(stclients);
-
-                       rrd_stats_dimension_set(stclients, "clients", global_statistics.connected_clients);
-                       rrd_stats_done(stclients);
-
-                       // ----------------------------------------------------------------
-
-                       if(!streqs) streqs = rrd_stats_find("netdata.requests");
-                       if(!streqs) {
-                               streqs = rrd_stats_create("netdata", "requests", NULL, "netdata", "NetData Web Requests", "requests/s", 12000, update_every, CHART_TYPE_LINE);
-
-                               rrd_stats_dimension_add(streqs, "requests",  NULL,  1, 1 * update_every, RRD_DIMENSION_INCREMENTAL);
-                       }
-                       else rrd_stats_next(streqs);
-
-                       rrd_stats_dimension_set(streqs, "requests", global_statistics.web_requests);
-                       rrd_stats_done(streqs);
-
-                       // ----------------------------------------------------------------
-
-                       if(!stbytes) stbytes = rrd_stats_find("netdata.net");
-                       if(!stbytes) {
-                               stbytes = rrd_stats_create("netdata", "net", NULL, "netdata", "NetData Network Traffic", "kilobits/s", 13000, update_every, CHART_TYPE_AREA);
-
-                               rrd_stats_dimension_add(stbytes, "in",  NULL,  8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
-                               rrd_stats_dimension_add(stbytes, "out",  NULL,  -8, 1024 * update_every, RRD_DIMENSION_INCREMENTAL);
-                       }
-                       else rrd_stats_next(stbytes);
-
-                       rrd_stats_dimension_set(stbytes, "in", global_statistics.bytes_received);
-                       rrd_stats_dimension_set(stbytes, "out", global_statistics.bytes_sent);
-                       rrd_stats_done(stbytes);
-               }
-
-               usleep(susec);
-               
-               // copy current to last
-               bcopy(&now, &last, sizeof(struct timeval));
-       }
-
-       return NULL;
+
+static struct proc_module {
+    const char *name;
+    const char *dim;
+
+    int enabled;
+
+    int (*func)(int update_every, usec_t dt);
+    usec_t last_run_usec;
+    usec_t duration;
+
+    RRDDIM *rd;
+
+} proc_modules[] = {
+
+        // system metrics
+        { .name = "/proc/stat", .dim = "stat", .func = do_proc_stat },
+        { .name = "/proc/uptime", .dim = "uptime", .func = do_proc_uptime },
+        { .name = "/proc/loadavg", .dim = "loadavg", .func = do_proc_loadavg },
+        { .name = "/proc/sys/kernel/random/entropy_avail", .dim = "entropy", .func = do_proc_sys_kernel_random_entropy_avail },
+
+        // CPU metrics
+        { .name = "/proc/interrupts", .dim = "interrupts", .func = do_proc_interrupts },
+        { .name = "/proc/softirqs", .dim = "softirqs", .func = do_proc_softirqs },
+
+        // memory metrics
+        { .name = "/proc/vmstat", .dim = "vmstat", .func = do_proc_vmstat },
+        { .name = "/proc/meminfo", .dim = "meminfo", .func = do_proc_meminfo },
+        { .name = "/sys/kernel/mm/ksm", .dim = "ksm", .func = do_sys_kernel_mm_ksm },
+        { .name = "/sys/devices/system/edac/mc", .dim = "ecc", .func = do_proc_sys_devices_system_edac_mc },
+
+        // network metrics
+        { .name = "/proc/net/dev", .dim = "netdev", .func = do_proc_net_dev },
+        { .name = "/proc/net/netstat", .dim = "netstat", .func = do_proc_net_netstat },
+        { .name = "/proc/net/snmp", .dim = "snmp", .func = do_proc_net_snmp },
+        { .name = "/proc/net/snmp6", .dim = "snmp6", .func = do_proc_net_snmp6 },
+        { .name = "/proc/net/softnet_stat", .dim = "softnet", .func = do_proc_net_softnet_stat },
+        { .name = "/proc/net/ip_vs/stats", .dim = "ipvs", .func = do_proc_net_ip_vs_stats },
+
+        // firewall metrics
+        { .name = "/proc/net/stat/conntrack", .dim = "conntrack", .func = do_proc_net_stat_conntrack },
+        { .name = "/proc/net/stat/synproxy", .dim = "synproxy", .func = do_proc_net_stat_synproxy },
+
+        // disk metrics
+        { .name = "/proc/diskstats", .dim = "diskstats", .func = do_proc_diskstats },
+
+        // NFS metrics
+        { .name = "/proc/net/rpc/nfsd", .dim = "nfsd", .func = do_proc_net_rpc_nfsd },
+        { .name = "/proc/net/rpc/nfs", .dim = "nfs", .func = do_proc_net_rpc_nfs },
+
+        // IPC metrics
+        { .name = "ipc", .dim = "ipc", .func = do_ipc },
+
+        // the terminator of this array
+        { .name = NULL, .dim = NULL, .func = NULL }
+};
+
+void *proc_main(void *ptr) {
+    struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
+
+    info("PROC Plugin 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_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
+        error("Cannot set pthread cancel state to ENABLE.");
+
+    int vdo_cpu_netdata = config_get_boolean("plugin:proc", "netdata server resources", 1);
+
+    // check the enabled status for each module
+    int i;
+    for(i = 0 ; proc_modules[i].name ;i++) {
+        struct proc_module *pm = &proc_modules[i];
+
+        pm->enabled = config_get_boolean("plugin:proc", pm->name, 1);
+        pm->last_run_usec = 0ULL;
+        pm->duration = 0ULL;
+        pm->rd = NULL;
+    }
+
+    usec_t step = rrd_update_every * USEC_PER_SEC;
+    for(;;) {
+        usec_t now = now_monotonic_usec();
+        usec_t next = now - (now % step) + step;
+
+        while(now < next) {
+            sleep_usec(next - now);
+            now = now_monotonic_usec();
+        }
+
+        if(unlikely(netdata_exit)) break;
+
+        // BEGIN -- the job to be done
+
+        for(i = 0 ; proc_modules[i].name ;i++) {
+            struct proc_module *pm = &proc_modules[i];
+            if(unlikely(!pm->enabled)) continue;
+
+            debug(D_PROCNETDEV_LOOP, "PROC calling %s.", pm->name);
+
+            pm->enabled = !pm->func(rrd_update_every, (pm->last_run_usec > 0)?now - pm->last_run_usec:0ULL);
+            pm->last_run_usec = now;
+
+            now = now_monotonic_usec();
+            pm->duration = now - pm->last_run_usec;
+
+            if(unlikely(netdata_exit)) break;
+        }
+
+        // END -- the job is done
+
+        // --------------------------------------------------------------------
+
+        if(vdo_cpu_netdata) {
+            static RRDSET *st = NULL;
+
+            if(unlikely(!st)) {
+                st = rrdset_find_bytype("netdata", "plugin_proc_modules");
+
+                if(!st) {
+                    st = rrdset_create("netdata", "plugin_proc_modules", NULL, "proc", NULL, "NetData Proc Plugin Modules Durations", "milliseconds/run", 132001, rrd_update_every, RRDSET_TYPE_STACKED);
+
+                    for(i = 0 ; proc_modules[i].name ;i++) {
+                        struct proc_module *pm = &proc_modules[i];
+                        if(unlikely(!pm->enabled)) continue;
+
+                        pm->rd = rrddim_add(st, pm->dim, NULL, 1, 1000, RRDDIM_ABSOLUTE);
+                    }
+                }
+            }
+            else rrdset_next(st);
+
+            for(i = 0 ; proc_modules[i].name ;i++) {
+                struct proc_module *pm = &proc_modules[i];
+                if(unlikely(!pm->enabled)) continue;
+
+                rrddim_set_by_pointer(st, pm->rd, pm->duration);
+            }
+            rrdset_done(st);
+
+            global_statistics_charts();
+            registry_statistics();
+        }
+    }
+
+    info("PROC thread exiting");
+
+    static_thread->enabled = 0;
+    static_thread->thread = NULL;
+    pthread_exit(NULL);
+    return NULL;
 }