Merge tag 'upstream/1.2.0'

Upstream version 1.2.0

1 files changed, 37 insertions, 30 deletions

diff --git a/src/proc_softirqs.c b/src/proc_softirqs.c
index c3a75f60..96b5d3d3 100644
--- a/src/proc_softirqs.c
+++ b/src/proc_softirqs.c
@@ -13,29 +13,34 @@
 #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;
+	unsigned long long value[];
 };
 
-static struct interrupt *alloc_interrupts(int lines) {
+// since each interrupt is variable in size
+// we use this to calculate its record size
+#define recordsize(cpus) (sizeof(struct interrupt) + (cpus * sizeof(unsigned long long)))
+
+// given a base, get a pointer to each record
+#define irrindex(base, line, cpus) ((struct interrupt *)&((char *)(base))[line * recordsize(cpus)])
+
+static inline struct interrupt *get_interrupts_array(int lines, int cpus) {
 	static struct interrupt *irrs = NULL;
-	static int alloced = 0;
+	static int allocated = 0;
 
-	if(lines < alloced) return irrs;
+	if(lines < allocated) return irrs;
 	else {
-		irrs = (struct interrupt *)realloc(irrs, lines * sizeof(struct interrupt));
+		irrs = (struct interrupt *)realloc(irrs, lines * recordsize(cpus));
 		if(!irrs)
 			fatal("Cannot allocate memory for %d interrupts", lines);
 
-		alloced = lines;
+		allocated = lines;
 	}
 
 	return irrs;
@@ -53,7 +58,7 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
 
 	if(!ff) {
 		char filename[FILENAME_MAX + 1];
-		snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/softirqs");
+		snprintfz(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;
@@ -76,8 +81,6 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
 			if(strncmp(procfile_lineword(ff, 0, w), "CPU", 3) == 0)
 				cpus++;
 		}
-
-		if(cpus > MAX_INTERRUPT_CPUS) cpus = MAX_INTERRUPT_CPUS;
 	}
 
 	if(!cpus) {
@@ -86,12 +89,12 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
 	}
 
 	// allocate the size we need;
-	irrs = alloc_interrupts(lines);
+	irrs = get_interrupts_array(lines, cpus);
 	irrs[0].used = 0;
 
 	// loop through all lines
 	for(l = 1; l < lines ;l++) {
-		struct interrupt *irr = &irrs[l];
+		struct interrupt *irr = irrindex(irrs, l, cpus);
 		irr->used = 0;
 		irr->total = 0;
 
@@ -115,8 +118,7 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
 			irr->total += irr->value[c];
 		}
 
-		strncpy(irr->name, irr->id, MAX_INTERRUPT_NAME);
-		irr->name[MAX_INTERRUPT_NAME] = '\0';
+		strncpyz(irr->name, irr->id, MAX_INTERRUPT_NAME);
 
 		irr->used = 1;
 	}
@@ -130,15 +132,17 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
 		st = rrdset_create("system", "softirqs", NULL, "softirqs", NULL, "System softirqs", "softirqs/s", 950, 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);
+			struct interrupt *irr = irrindex(irrs, l, cpus);
+			if(!irr->used) continue;
+			rrddim_add(st, irr->id, irr->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);
+		struct interrupt *irr = irrindex(irrs, l, cpus);
+		if(!irr->used) continue;
+		rrddim_set(st, irr->id, irr->total);
 	}
 	rrdset_done(st);
 
@@ -146,34 +150,37 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
 		int c;
 
 		for(c = 0; c < cpus ; c++) {
-			char id[256];
-			snprintf(id, 256, "cpu%d_softirqs", c);
+			char id[256+1];
+			snprintfz(id, 256, "cpu%d_softirqs", c);
 
 			st = rrdset_find_bytype("cpu", id);
 			if(!st) {
 				// find if everything is zero
 				unsigned long long core_sum = 0 ;
 				for(l = 0; l < lines ;l++) {
-					if(!irrs[l].used) continue;
-					core_sum += irrs[l].value[c];
+					struct interrupt *irr = irrindex(irrs, l, cpus);
+					if(!irr->used) continue;
+					core_sum += irr->value[c];
 				}
 				if(core_sum == 0) continue; // try next core
 
-				char name[256], title[256];
-				snprintf(name, 256, "cpu%d_softirqs", c);
-				snprintf(title, 256, "CPU%d softirqs", c);
+				char name[256+1], title[256+1];
+				snprintfz(name, 256, "cpu%d_softirqs", c);
+				snprintfz(title, 256, "CPU%d softirqs", c);
 				st = rrdset_create("cpu", id, name, "softirqs", "cpu.softirqs", 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);
+					struct interrupt *irr = irrindex(irrs, l, cpus);
+					if(!irr->used) continue;
+					rrddim_add(st, irr->id, irr->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]);
+				struct interrupt *irr = irrindex(irrs, l, cpus);
+				if(!irr->used) continue;
+				rrddim_set(st, irr->id, irr->value[c]);
 			}
 			rrdset_done(st);
 		}