]> arthur.barton.de Git - netdata.git/blobdiff - src/plugin_proc.c
global statistics now also report max API response time; global statistics implemente...
[netdata.git] / src / plugin_proc.c
index e7b8d50c87d64c2695c4b63373eb92418f496cdf..ac45775a855cce39a5b14eb2662e671ce41d0be4 100644 (file)
@@ -1,30 +1,9 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#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 "appconfig.h"
-#include "log.h"
-#include "rrd.h"
-#include "plugin_proc.h"
-#include "main.h"
-#include "registry.h"
 
 void *proc_main(void *ptr)
 {
        (void)ptr;
 
-       unsigned long long old_web_requests = 0, old_web_usec = 0,
-                       old_content_size = 0, old_compressed_content_size = 0;
-
-       collected_number compression_ratio = -1, average_response_time = -1;
-
        info("PROC Plugin thread created with task id %d", gettid());
 
        if(pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL) != 0)
@@ -33,8 +12,6 @@ void *proc_main(void *ptr)
        if(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
                error("Cannot set pthread cancel state to ENABLE.");
 
-       struct rusage me, thread;
-
        // 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);
@@ -82,18 +59,15 @@ void *proc_main(void *ptr)
        unsigned long long sunext = (time(NULL) - (time(NULL) % rrd_update_every) + rrd_update_every) * 1000000ULL;
        unsigned long long sunow;
 
-       RRDSET *stcpu = NULL, *stcpu_thread = NULL, *stclients = NULL, *streqs = NULL, *stbytes = NULL, *stduration = NULL,
-                       *stcompression = NULL;
-
        for(;1;) {
                if(unlikely(netdata_exit)) break;
 
                // delay until it is our time to run
-               while((sunow = timems()) < sunext)
-                       usecsleep(sunext - sunow);
+               while((sunow = time_usec()) < sunext)
+                       sleep_usec(sunext - sunow);
 
                // find the next time we need to run
-               while(timems() > sunext)
+               while(time_usec() > sunext)
                        sunext += rrd_update_every * 1000000ULL;
 
                if(unlikely(netdata_exit)) break;
@@ -103,7 +77,7 @@ void *proc_main(void *ptr)
                if(!vdo_sys_kernel_mm_ksm) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_sys_kernel_mm_ksm().");
 
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_sys_kernel_mm_ksm = do_sys_kernel_mm_ksm(rrd_update_every, (sutime_sys_kernel_mm_ksm > 0)?sunow - sutime_sys_kernel_mm_ksm:0ULL);
                        sutime_sys_kernel_mm_ksm = sunow;
                }
@@ -111,7 +85,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_loadavg) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_loadavg().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_loadavg = do_proc_loadavg(rrd_update_every, (sutime_proc_loadavg > 0)?sunow - sutime_proc_loadavg:0ULL);
                        sutime_proc_loadavg = sunow;
                }
@@ -119,7 +93,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_interrupts) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_interrupts().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_interrupts = do_proc_interrupts(rrd_update_every, (sutime_proc_interrupts > 0)?sunow - sutime_proc_interrupts:0ULL);
                        sutime_proc_interrupts = sunow;
                }
@@ -127,7 +101,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_softirqs) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_softirqs().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_softirqs = do_proc_softirqs(rrd_update_every, (sutime_proc_softirqs > 0)?sunow - sutime_proc_softirqs:0ULL);
                        sutime_proc_softirqs = sunow;
                }
@@ -135,7 +109,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_sys_kernel_random_entropy_avail) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_sys_kernel_random_entropy_avail().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_sys_kernel_random_entropy_avail = do_proc_sys_kernel_random_entropy_avail(rrd_update_every, (sutime_proc_sys_kernel_random_entropy_avail > 0)?sunow - sutime_proc_sys_kernel_random_entropy_avail:0ULL);
                        sutime_proc_sys_kernel_random_entropy_avail = sunow;
                }
@@ -143,7 +117,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_dev) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_dev().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_dev = do_proc_net_dev(rrd_update_every, (sutime_proc_net_dev > 0)?sunow - sutime_proc_net_dev:0ULL);
                        sutime_proc_net_dev = sunow;
                }
@@ -151,7 +125,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_diskstats) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_diskstats().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_diskstats = do_proc_diskstats(rrd_update_every, (sutime_proc_diskstats > 0)?sunow - sutime_proc_diskstats:0ULL);
                        sutime_proc_diskstats = sunow;
                }
@@ -159,7 +133,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_snmp) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_snmp().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_snmp = do_proc_net_snmp(rrd_update_every, (sutime_proc_net_snmp > 0)?sunow - sutime_proc_net_snmp:0ULL);
                        sutime_proc_net_snmp = sunow;
                }
@@ -167,7 +141,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_snmp6) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_snmp6().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_snmp6 = do_proc_net_snmp6(rrd_update_every, (sutime_proc_net_snmp6 > 0)?sunow - sutime_proc_net_snmp6:0ULL);
                        sutime_proc_net_snmp6 = sunow;
                }
@@ -175,7 +149,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_netstat) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_netstat().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_netstat = do_proc_net_netstat(rrd_update_every, (sutime_proc_net_netstat > 0)?sunow - sutime_proc_net_netstat:0ULL);
                        sutime_proc_net_netstat = sunow;
                }
@@ -183,7 +157,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_stat_conntrack) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_stat_conntrack().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_stat_conntrack     = do_proc_net_stat_conntrack(rrd_update_every, (sutime_proc_net_stat_conntrack > 0)?sunow - sutime_proc_net_stat_conntrack:0ULL);
                        sutime_proc_net_stat_conntrack = sunow;
                }
@@ -191,7 +165,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_ip_vs_stats) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_net_ip_vs_stats().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_ip_vs_stats = do_proc_net_ip_vs_stats(rrd_update_every, (sutime_proc_net_ip_vs_stats > 0)?sunow - sutime_proc_net_ip_vs_stats:0ULL);
                        sutime_proc_net_ip_vs_stats = sunow;
                }
@@ -199,7 +173,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_stat_synproxy) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_net_stat_synproxy().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_stat_synproxy = do_proc_net_stat_synproxy(rrd_update_every, (sutime_proc_net_stat_synproxy > 0)?sunow - sutime_proc_net_stat_synproxy:0ULL);
                        sutime_proc_net_stat_synproxy = sunow;
                }
@@ -207,7 +181,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_stat) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_stat().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_stat = do_proc_stat(rrd_update_every, (sutime_proc_stat > 0)?sunow - sutime_proc_stat:0ULL);
                        sutime_proc_stat = sunow;
                }
@@ -215,7 +189,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_meminfo) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_meminfo().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_meminfo = do_proc_meminfo(rrd_update_every, (sutime_proc_meminfo > 0)?sunow - sutime_proc_meminfo:0ULL);
                        sutime_proc_meminfo = sunow;
                }
@@ -223,7 +197,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_vmstat) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_vmstat().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_vmstat = do_proc_vmstat(rrd_update_every, (sutime_proc_vmstat > 0)?sunow - sutime_proc_vmstat:0ULL);
                        sutime_proc_vmstat = sunow;
                }
@@ -231,7 +205,7 @@ void *proc_main(void *ptr)
 
                if(!vdo_proc_net_rpc_nfsd) {
                        debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_rpc_nfsd().");
-                       sunow = timems();
+                       sunow = time_usec();
                        vdo_proc_net_rpc_nfsd = do_proc_net_rpc_nfsd(rrd_update_every, (sutime_proc_net_rpc_nfsd > 0)?sunow - sutime_proc_net_rpc_nfsd:0ULL);
                        sutime_proc_net_rpc_nfsd = sunow;
                }
@@ -242,136 +216,7 @@ void *proc_main(void *ptr)
                // --------------------------------------------------------------------
 
                if(!vdo_cpu_netdata) {
-                       getrusage(RUSAGE_THREAD, &thread);
-                       getrusage(RUSAGE_SELF, &me);
-
-                       if(!stcpu_thread) stcpu_thread = rrdset_find("netdata.plugin_proc_cpu");
-                       if(!stcpu_thread) {
-                               stcpu_thread = rrdset_create("netdata", "plugin_proc_cpu", NULL, "proc.internal", NULL, "NetData Proc Plugin CPU usage", "milliseconds/s", 132000, rrd_update_every, RRDSET_TYPE_STACKED);
-
-                               rrddim_add(stcpu_thread, "user",  NULL,  1, 1000, RRDDIM_INCREMENTAL);
-                               rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
-                       }
-                       else rrdset_next(stcpu_thread);
-
-                       rrddim_set(stcpu_thread, "user"  , thread.ru_utime.tv_sec * 1000000ULL + thread.ru_utime.tv_usec);
-                       rrddim_set(stcpu_thread, "system", thread.ru_stime.tv_sec * 1000000ULL + thread.ru_stime.tv_usec);
-                       rrdset_done(stcpu_thread);
-
-                       // ----------------------------------------------------------------
-
-                       if(!stcpu) stcpu = rrdset_find("netdata.server_cpu");
-                       if(!stcpu) {
-                               stcpu = rrdset_create("netdata", "server_cpu", NULL, "netdata", NULL, "NetData CPU usage", "milliseconds/s", 130000, rrd_update_every, RRDSET_TYPE_STACKED);
-
-                               rrddim_add(stcpu, "user",  NULL,  1, 1000, RRDDIM_INCREMENTAL);
-                               rrddim_add(stcpu, "system", NULL, 1, 1000, RRDDIM_INCREMENTAL);
-                       }
-                       else rrdset_next(stcpu);
-
-                       rrddim_set(stcpu, "user"  , me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec);
-                       rrddim_set(stcpu, "system", me.ru_stime.tv_sec * 1000000ULL + me.ru_stime.tv_usec);
-                       rrdset_done(stcpu);
-
-                       // ----------------------------------------------------------------
-
-                       if(!stclients) stclients = rrdset_find("netdata.clients");
-                       if(!stclients) {
-                               stclients = rrdset_create("netdata", "clients", NULL, "netdata", NULL, "NetData Web Clients", "connected clients", 130100, rrd_update_every, RRDSET_TYPE_LINE);
-
-                               rrddim_add(stclients, "clients",  NULL,  1, 1, RRDDIM_ABSOLUTE);
-                       }
-                       else rrdset_next(stclients);
-
-                       rrddim_set(stclients, "clients", global_statistics.connected_clients);
-                       rrdset_done(stclients);
-
-                       // ----------------------------------------------------------------
-
-                       if(!streqs) streqs = rrdset_find("netdata.requests");
-                       if(!streqs) {
-                               streqs = rrdset_create("netdata", "requests", NULL, "netdata", NULL, "NetData Web Requests", "requests/s", 130200, rrd_update_every, RRDSET_TYPE_LINE);
-
-                               rrddim_add(streqs, "requests",  NULL,  1, 1, RRDDIM_INCREMENTAL);
-                       }
-                       else rrdset_next(streqs);
-
-                       rrddim_set(streqs, "requests", global_statistics.web_requests);
-                       rrdset_done(streqs);
-
-                       // ----------------------------------------------------------------
-
-                       if(!stbytes) stbytes = rrdset_find("netdata.net");
-                       if(!stbytes) {
-                               stbytes = rrdset_create("netdata", "net", NULL, "netdata", NULL, "NetData Network Traffic", "kilobits/s", 130300, rrd_update_every, RRDSET_TYPE_AREA);
-
-                               rrddim_add(stbytes, "in",  NULL,  8, 1024, RRDDIM_INCREMENTAL);
-                               rrddim_add(stbytes, "out",  NULL,  -8, 1024, RRDDIM_INCREMENTAL);
-                       }
-                       else rrdset_next(stbytes);
-
-                       rrddim_set(stbytes, "in", global_statistics.bytes_received);
-                       rrddim_set(stbytes, "out", global_statistics.bytes_sent);
-                       rrdset_done(stbytes);
-
-                       // ----------------------------------------------------------------
-
-                       if(!stduration) stduration = rrdset_find("netdata.response_time");
-                       if(!stduration) {
-                               stduration = rrdset_create("netdata", "response_time", NULL, "netdata", NULL, "NetData Average API Response Time", "ms/request", 130400, rrd_update_every, RRDSET_TYPE_LINE);
-
-                               rrddim_add(stduration, "response_time", "response time",  1, 1000, RRDDIM_ABSOLUTE);
-                       }
-                       else rrdset_next(stduration);
-
-                       unsigned long long gweb_usec     = global_statistics.web_usec;
-                       unsigned long long gweb_requests = global_statistics.web_requests;
-
-                       unsigned long long web_usec     = gweb_usec     - old_web_usec;
-                       unsigned long long web_requests = gweb_requests - old_web_requests;
-
-                       old_web_usec     = gweb_usec;
-                       old_web_requests = gweb_requests;
-
-                       if(web_requests)
-                               average_response_time =  web_usec / web_requests;
-
-                       if(average_response_time != -1)
-                               rrddim_set(stduration, "response_time", average_response_time);
-
-                       rrdset_done(stduration);
-
-                       // ----------------------------------------------------------------
-
-                       if(!stcompression) stcompression = rrdset_find("netdata.compression_ratio");
-                       if(!stcompression) {
-                               stcompression = rrdset_create("netdata", "compression_ratio", NULL, "netdata", NULL, "NetData API Responses Compression Savings Ratio", "percentage", 130500, rrd_update_every, RRDSET_TYPE_LINE);
-
-                               rrddim_add(stcompression, "savings", NULL,  1, 1000, RRDDIM_ABSOLUTE);
-                       }
-                       else rrdset_next(stcompression);
-
-                       // since we don't lock here to read the global statistics
-                       // read the smaller value first
-                       unsigned long long gcompressed_content_size = global_statistics.compressed_content_size;
-                       unsigned long long gcontent_size            = global_statistics.content_size;
-
-                       unsigned long long compressed_content_size  = gcompressed_content_size - old_compressed_content_size;
-                       unsigned long long content_size             = gcontent_size            - old_content_size;
-
-                       old_compressed_content_size = gcompressed_content_size;
-                       old_content_size            = gcontent_size;
-
-                       if(content_size && content_size >= compressed_content_size)
-                               compression_ratio = ((content_size - compressed_content_size) * 100 * 1000) / content_size;
-
-                       if(compression_ratio != -1)
-                               rrddim_set(stcompression, "savings", compression_ratio);
-
-                       rrdset_done(stcompression);
-
-                       // ----------------------------------------------------------------
-
+            global_statistics_charts();
                        registry_statistics();
                }
        }