added softirqs collection from /proc/softirqs; fixed idlejitter time shift;

5 files changed, 163 insertions, 1 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 92f91a0f29..0f89cf1e82 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ netdata_SOURCES = \
 	popen.c popen.h \
 	proc_diskstats.c \
 	proc_interrupts.c \
+	proc_softirqs.c \
 	proc_meminfo.c \
 	proc_net_dev.c \
 	proc_net_ip_vs_stats.c \
diff --git a/src/plugin_idlejitter.c b/src/plugin_idlejitter.c
index 92b9b393d3..b5ec800964 100755
--- a/src/plugin_idlejitter.c
+++ b/src/plugin_idlejitter.c
@@ -57,7 +57,7 @@ void *cpuidlejitter_main(void *ptr)
 		}
 		usec -= (sleep_ms * 1000);
 
-		if(counter) rrdset_next_usec(st, susec);
+		if(counter) rrdset_next(st);
 		rrddim_set(st, "jitter", usec);
 		rrdset_done(st);
 	}
diff --git a/src/plugin_proc.c b/src/plugin_proc.c
index 40ec38aab6..f9ae82755d 100755
--- a/src/plugin_proc.c
+++ b/src/plugin_proc.c
@@ -49,6 +49,7 @@ 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_cpu_netdata 			= !config_get_boolean("plugin:proc", "netdata server resources", 1);
 
 	RRDSET *stcpu = NULL, *stcpu_thread = NULL, *stclients = NULL, *streqs = NULL, *stbytes = NULL;
@@ -64,6 +65,10 @@ void *proc_main(void *ptr)
 			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);
diff --git a/src/plugin_proc.h b/src/plugin_proc.h
index fa074ac13b..41ba785c38 100755
--- a/src/plugin_proc.h
+++ b/src/plugin_proc.h
@@ -15,5 +15,6 @@ extern int do_proc_vmstat(int update_every, unsigned long long dt);
 extern int do_proc_net_rpc_nfsd(int update_every, unsigned long long dt);
 extern int do_proc_sys_kernel_random_entropy_avail(int update_every, unsigned long long dt);
 extern int do_proc_interrupts(int update_every, unsigned long long dt);
+extern int do_proc_softirqs(int update_every, unsigned long long dt);
 
 #endif /* NETDATA_PLUGIN_PROC_H */
diff --git a/src/proc_softirqs.c b/src/proc_softirqs.c
new file mode 100755
index 0000000000..d2122817e4
--- /dev/null
+++ b/src/proc_softirqs.c
@@ -0,0 +1,155 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "common.h"
+#include "appconfig.h"
+#include "procfile.h"
+#include "rrd.h"
+#include "plugin_proc.h"
+#include "log.h"
+
+#define MAX_INTERRUPTS 256
+#define MAX_INTERRUPT_CPUS 256
+#define MAX_INTERRUPT_NAME 50
+
+struct interrupt {
+	int used;
+	char *id;
+	char name[MAX_INTERRUPT_NAME + 1];
+	unsigned long long value[MAX_INTERRUPT_CPUS];
+	unsigned long long total;
+};
+
+int do_proc_softirqs(int update_every, unsigned long long dt) {
+	static procfile *ff = NULL;
+	static int cpus = -1, do_per_core = -1;
+
+	if(dt) {};
+
+	if(do_per_core == -1) do_per_core = config_get_boolean("plugin:proc:/proc/softirqs", "interrupts per core", 1);
+
+	if(!ff) {
+		char filename[FILENAME_MAX + 1];
+		snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/softirqs");
+		ff = procfile_open(config_get("plugin:proc:/proc/softirqs", "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
+	}
+	if(!ff) return 1;
+
+	ff = procfile_readall(ff);
+	if(!ff) return 0; // we return 0, so that we will retry to open it next time
+
+	uint32_t lines = procfile_lines(ff), l;
+	uint32_t words = procfile_linewords(ff, 0), w;
+
+	// find how many CPUs are there
+	if(cpus == -1) {
+		cpus = 0;
+		for(w = 0; w < words ; w++) {
+			if(strncmp(procfile_lineword(ff, 0, w), "CPU", 3) == 0)
+				cpus++;
+		}
+
+		if(cpus > MAX_INTERRUPT_CPUS) cpus = MAX_INTERRUPT_CPUS;
+	}
+
+	if(!cpus) {
+		error("PLUGIN: PROC_SOFTIRQS: Cannot find the number of CPUs in /proc/softirqs");
+		return 1;
+	}
+
+	// allocate the size we need;
+	struct interrupt irrs[lines];
+	irrs[0].used = 0;
+
+	// loop through all lines
+	for(l = 1; l < lines ;l++) {
+		struct interrupt *irr = &irrs[l];
+		irr->used = 0;
+		irr->total = 0;
+
+		words = procfile_linewords(ff, l);
+		if(!words) continue;
+
+		irr->id = procfile_lineword(ff, l, 0);
+		if(!irr->id || !irr->id[0]) continue;
+
+		int idlen = strlen(irr->id);
+		if(irr->id[idlen - 1] == ':')
+			irr->id[idlen - 1] = '\0';
+
+		int c;
+		for(c = 0; c < cpus ;c++) {
+			if((c + 1) < (int)words)
+				irr->value[c] = strtoull(procfile_lineword(ff, l, (uint32_t)(c + 1)), NULL, 10);
+			else
+				irr->value[c] = 0;
+
+			irr->total += irr->value[c];
+		}
+
+		strncpy(irr->name, irr->id, MAX_INTERRUPT_NAME);
+		irr->name[MAX_INTERRUPT_NAME] = '\0';
+
+		irr->used = 1;
+	}
+
+	RRDSET *st;
+
+	// --------------------------------------------------------------------
+
+	st = rrdset_find_bytype("system", "softirqs");
+	if(!st) {
+		st = rrdset_create("system", "softirqs", NULL, "system", "System softirqs", "softirqs/s", 1001, update_every, RRDSET_TYPE_STACKED);
+
+		for(l = 0; l < lines ;l++) {
+			if(!irrs[l].used) continue;
+			rrddim_add(st, irrs[l].id, irrs[l].name, 1, 1, RRDDIM_INCREMENTAL);
+		}
+	}
+	else rrdset_next(st);
+
+	for(l = 0; l < lines ;l++) {
+		if(!irrs[l].used) continue;
+		rrddim_set(st, irrs[l].id, irrs[l].total);
+	}
+	rrdset_done(st);
+
+	if(do_per_core) {
+		int c;
+
+		for(c = 0; c < cpus ; c++) {
+			char family[256];
+			snprintf(family, 256, "cpu%d", c);
+
+			char id[256];
+			snprintf(id, 256, "cpu%d_softirqs", c);
+
+			st = rrdset_find_bytype("cpu", id);
+			if(!st) {
+				char name[256], title[256];
+				snprintf(name, 256, "cpu%d_softirqs", c);
+				snprintf(title, 256, "CPU%d softirqs", c);
+				st = rrdset_create("cpu", id, name, family, title, "softirqs/s", 3000 + c, update_every, RRDSET_TYPE_STACKED);
+
+				for(l = 0; l < lines ;l++) {
+					if(!irrs[l].used) continue;
+					rrddim_add(st, irrs[l].id, irrs[l].name, 1, 1, RRDDIM_INCREMENTAL);
+				}
+			}
+			else rrdset_next(st);
+
+			for(l = 0; l < lines ;l++) {
+				if(!irrs[l].used) continue;
+				rrddim_set(st, irrs[l].id, irrs[l].value[c]);
+			}
+			rrdset_done(st);
+		}
+	}
+
+	return 0;
+}