]> arthur.barton.de Git - netdata.git/blobdiff - src/proc_interrupts.c
Merge pull request #1998 from ktsaou/master
[netdata.git] / src / proc_interrupts.c
old mode 100755 (executable)
new mode 100644 (file)
index e955b80..082e1f5
-#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 cpu_interrupt {
+    unsigned long long value;
+    RRDDIM *rd;
+};
+
 struct interrupt {
-       int used;
-       char *id;
-       char name[MAX_INTERRUPT_NAME + 1];
-       unsigned long long value[MAX_INTERRUPT_CPUS];
-       unsigned long long total;
+    int used;
+    char *id;
+    char name[MAX_INTERRUPT_NAME + 1];
+    RRDDIM *rd;
+    unsigned long long total;
+    struct cpu_interrupt cpu[];
 };
 
-int do_proc_interrupts(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/interrupts", "interrupts per core", 1);
-
-       if(!ff) {
-               char filename[FILENAME_MAX + 1];
-               snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/interrupts");
-               ff = procfile_open(config_get("plugin:proc:/proc/interrupts", "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_INTERRUPTS: Cannot find the number of CPUs in /proc/interrupts");
-               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];
-               }
-
-               if(isdigit(irr->id[0]) && (uint32_t)(cpus + 2) < words) {
-                       strncpy(irr->name, procfile_lineword(ff, l, words - 1), MAX_INTERRUPT_NAME);
-                       irr->name[MAX_INTERRUPT_NAME] = '\0';
-                       int nlen = strlen(irr->name);
-                       if(nlen < (MAX_INTERRUPT_NAME-1)) {
-                               irr->name[nlen] = '_';
-                               strncpy(&irr->name[nlen + 1], irr->id, MAX_INTERRUPT_NAME - nlen);
-                               irr->name[MAX_INTERRUPT_NAME] = '\0';
-                       }
-               }
-               else {
-                       strncpy(irr->name, irr->id, MAX_INTERRUPT_NAME);
-                       irr->name[MAX_INTERRUPT_NAME] = '\0';
-               }
-
-               irr->used = 1;
-       }
-
-       RRDSET *st;
-
-       // --------------------------------------------------------------------
-
-       st = rrdset_find_bytype("system", "interrupts");
-       if(!st) {
-               st = rrdset_create("system", "interrupts", NULL, "system", "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);
-               }
-       }
-       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_interrupts", c);
-
-                       st = rrdset_find_bytype("cpu", id);
-                       if(!st) {
-                               char name[256], title[256];
-                               snprintf(name, 256, "cpu%d_interrupts", c);
-                               snprintf(title, 256, "CPU%d Interrupts", c);
-                               st = rrdset_create("cpu", id, name, family, 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);
-                               }
-                       }
-                       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;
+// since each interrupt is variable in size
+// we use this to calculate its record size
+#define recordsize(cpus) (sizeof(struct interrupt) + (cpus * sizeof(struct cpu_interrupt)))
+
+// 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(size_t lines, int cpus) {
+    static struct interrupt *irrs = NULL;
+    static size_t allocated = 0;
+
+    if(unlikely(lines != allocated)) {
+        size_t l;
+        int c;
+
+        irrs = (struct interrupt *)reallocz(irrs, lines * recordsize(cpus));
+
+        // reset all interrupt RRDDIM pointers as any line could have shifted
+        for(l = 0; l < lines ;l++) {
+            struct interrupt *irr = irrindex(irrs, l, cpus);
+            irr->rd = NULL;
+            irr->name[0] = '\0';
+            for(c = 0; c < cpus ;c++)
+                irr->cpu[c].rd = NULL;
+        }
+
+        allocated = lines;
+    }
+
+    return irrs;
+}
+
+int do_proc_interrupts(int update_every, usec_t dt) {
+    (void)dt;
+    static procfile *ff = NULL;
+    static int cpus = -1, do_per_core = -1;
+    struct interrupt *irrs = NULL;
+
+    if(unlikely(do_per_core == -1))
+        do_per_core = config_get_boolean("plugin:proc:/proc/interrupts", "interrupts per core", 1);
+
+    if(unlikely(!ff)) {
+        char filename[FILENAME_MAX + 1];
+        snprintfz(filename, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/proc/interrupts");
+        ff = procfile_open(config_get("plugin:proc:/proc/interrupts", "filename to monitor", filename), " \t", PROCFILE_FLAG_DEFAULT);
+    }
+    if(unlikely(!ff))
+        return 1;
+
+    ff = procfile_readall(ff);
+    if(unlikely(!ff))
+        return 0; // we return 0, so that we will retry to open it next time
+
+    size_t lines = procfile_lines(ff), l;
+    size_t words = procfile_linewords(ff, 0);
+
+    if(unlikely(!lines)) {
+        error("Cannot read /proc/interrupts, zero lines reported.");
+        return 1;
+    }
+
+    // find how many CPUs are there
+    if(unlikely(cpus == -1)) {
+        uint32_t w;
+        cpus = 0;
+        for(w = 0; w < words ; w++) {
+            if(likely(strncmp(procfile_lineword(ff, 0, w), "CPU", 3) == 0))
+                cpus++;
+        }
+    }
+
+    if(unlikely(!cpus)) {
+        error("PLUGIN: PROC_INTERRUPTS: Cannot find the number of CPUs in /proc/interrupts");
+        return 1;
+    }
+
+    // allocate the size we need;
+    irrs = get_interrupts_array(lines, cpus);
+    irrs[0].used = 0;
+
+    // loop through all lines
+    for(l = 1; l < lines ;l++) {
+        struct interrupt *irr = irrindex(irrs, l, cpus);
+        irr->used = 0;
+        irr->total = 0;
+
+        words = procfile_linewords(ff, l);
+        if(unlikely(!words)) continue;
+
+        irr->id = procfile_lineword(ff, l, 0);
+        if(unlikely(!irr->id || !irr->id[0])) continue;
+
+        size_t idlen = strlen(irr->id);
+        if(unlikely(idlen && irr->id[idlen - 1] == ':'))
+            irr->id[idlen - 1] = '\0';
+
+        int c;
+        for(c = 0; c < cpus ;c++) {
+            if(likely((c + 1) < (int)words))
+                irr->cpu[c].value = str2ull(procfile_lineword(ff, l, (uint32_t)(c + 1)));
+            else
+                irr->cpu[c].value = 0;
+
+            irr->total += irr->cpu[c].value;
+        }
+
+        if(unlikely(isdigit(irr->id[0]) && (uint32_t)(cpus + 2) < words)) {
+            strncpyz(irr->name, procfile_lineword(ff, l, words - 1), MAX_INTERRUPT_NAME);
+            size_t nlen = strlen(irr->name);
+            idlen = strlen(irr->id);
+            if(likely(nlen + 1 + idlen <= MAX_INTERRUPT_NAME)) {
+                irr->name[nlen] = '_';
+                strncpyz(&irr->name[nlen + 1], irr->id, MAX_INTERRUPT_NAME - nlen - 1);
+            }
+            else {
+                irr->name[MAX_INTERRUPT_NAME - idlen - 1] = '_';
+                strncpyz(&irr->name[MAX_INTERRUPT_NAME - idlen], irr->id, idlen);
+            }
+        }
+        else {
+            strncpyz(irr->name, irr->id, MAX_INTERRUPT_NAME);
+        }
+
+        irr->used = 1;
+    }
+
+    RRDSET *st;
+
+    // --------------------------------------------------------------------
+
+    st = rrdset_find_bytype_localhost("system", "interrupts");
+    if(unlikely(!st)) st = rrdset_create_localhost("system", "interrupts", NULL, "interrupts", NULL, "System interrupts"
+                                                   , "interrupts/s", 1000, update_every, RRDSET_TYPE_STACKED);
+    else rrdset_next(st);
+
+    for(l = 0; l < lines ;l++) {
+        struct interrupt *irr = irrindex(irrs, l, cpus);
+        if(unlikely(!irr->used)) continue;
+        // some interrupt may have changed without changing the total number of lines
+        // if the same number of interrupts have been added and removed between two
+        // calls of this function.
+        if(unlikely(!irr->rd || strncmp(irr->rd->name, irr->name, MAX_INTERRUPT_NAME) != 0)) {
+            irr->rd = rrddim_find(st, irr->id);
+            if(unlikely(!irr->rd))
+                irr->rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+            else
+                rrddim_set_name(st, irr->rd, irr->name);
+
+            // also reset per cpu RRDDIMs to avoid repeating strncmp() in the per core loop
+            if(likely(do_per_core)) {
+                int c;
+                for (c = 0; c < cpus ;c++)
+                    irr->cpu[c].rd = NULL;
+            }
+        }
+        rrddim_set_by_pointer(st, irr->rd, irr->total);
+    }
+    rrdset_done(st);
+
+    if(likely(do_per_core)) {
+        int c;
+
+        for(c = 0; c < cpus ;c++) {
+            char id[50+1];
+            snprintfz(id, 50, "cpu%d_interrupts", c);
+
+            st = rrdset_find_bytype_localhost("cpu", id);
+            if(unlikely(!st)) {
+                char title[100+1];
+                snprintfz(title, 100, "CPU%d Interrupts", c);
+                st = rrdset_create_localhost("cpu", id, NULL, "interrupts", "cpu.interrupts", title, "interrupts/s",
+                        1100 + c, update_every, RRDSET_TYPE_STACKED);
+            }
+            else rrdset_next(st);
+
+            for(l = 0; l < lines ;l++) {
+                struct interrupt *irr = irrindex(irrs, l, cpus);
+                if(unlikely(!irr->used)) continue;
+                if(unlikely(!irr->cpu[c].rd)) {
+                    irr->cpu[c].rd = rrddim_find(st, irr->id);
+                    if(unlikely(!irr->cpu[c].rd))
+                        irr->cpu[c].rd = rrddim_add(st, irr->id, irr->name, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+                    else
+                        rrddim_set_name(st, irr->cpu[c].rd, irr->name);
+                }
+                rrddim_set_by_pointer(st, irr->cpu[c].rd, irr->cpu[c].value);
+            }
+            rrdset_done(st);
+        }
+    }
+
+    return 0;
 }