fixed an unterminated buffer at registry.c; lowered the memory requirements of interr...

diff --git a/src/main.c b/src/main.c
index 5e9f49788517a3d787e58d073adfa5673811597d..9d1c8662d8beccded8244b2aa1172da3573e1869 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -530,7 +530,6 @@ int main(int argc, char **argv)
 
        registry_init();
 
-
        // ------------------------------------------------------------------------
        // spawn the threads
 

diff --git a/src/proc_interrupts.c b/src/proc_interrupts.c
index 6704ef1a59ac966d52b742fb8b6e35d9fd907ce5..153dd30113d4225e38c1b13db100b3ce93f46dc7 100644 (file)
--- a/src/proc_interrupts.c
+++ b/src/proc_interrupts.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;
@@ -44,7 +49,6 @@ static struct interrupt *alloc_interrupts(int lines) {
 int do_proc_interrupts(int update_every, unsigned long long dt) {
        static procfile *ff = NULL;
        static int cpus = -1, do_per_core = -1;
-
        struct interrupt *irrs = NULL;
 
        if(dt) {};
@@ -76,8 +80,6 @@ int do_proc_interrupts(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 +88,12 @@ int do_proc_interrupts(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;
 
@@ -142,15 +144,17 @@ int do_proc_interrupts(int update_every, unsigned long long dt) {
                st = rrdset_create("system", "interrupts", NULL, "interrupts", NULL, "System interrupts", "interrupts/s", 1000, 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);
 
@@ -169,15 +173,17 @@ int do_proc_interrupts(int update_every, unsigned long long dt) {
                                st = rrdset_create("cpu", id, name, "interrupts", "cpu.interrupts", title, "interrupts/s", 2000 + 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);
                }

diff --git a/src/proc_softirqs.c b/src/proc_softirqs.c
index c3a75f600abe0893f3b6393b2265c0b1fbf29ee5..0a350649aee8cf3fd80b00277e89f08f9637b360 100644 (file)
--- 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;
@@ -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;
 
@@ -130,15 +133,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);
 
@@ -154,8 +159,9 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
                                // 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
 
@@ -165,15 +171,17 @@ int do_proc_softirqs(int update_every, unsigned long long dt) {
                                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);
                }

diff --git a/src/registry.c b/src/registry.c
index 91747a5b1af46fcb54ea4bbe01deee645e49312a..8cc19d6242c1f9ee100ad63601fe6ee4dbd25651 100644 (file)
--- a/src/registry.c
+++ b/src/registry.c
@@ -425,6 +425,7 @@ static inline MACHINE *registry_machine_allocate(const char *machine_guid, time_
        if(!m) fatal("Registry: cannot allocate memory for new machine '%s'", machine_guid);
 
        strncpy(m->guid, machine_guid, 36);
+       m->guid[36] = '\0';
 
        debug(D_REGISTRY, "Registry: registry_machine_allocate('%s'): creating dictionary of urls", machine_guid);
        m->urls = dictionary_create(DICTIONARY_FLAGS);
@@ -1435,6 +1436,7 @@ static inline size_t registry_load(void) {
        }
 
        size_t len = 0;
+       buf[4096] = '\0';
        while((s = fgets_trim_len(buf, 4096, fp, &len))) {
                line++;