X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Firq.c;h=1168b979e07688a995a1a7e640c5237a28df8641;hb=5fb8bff2b2d2d5c61621c6686b343d7e0eea48f0;hp=34e02df3cb1f013984d907d77d4a47dc8054a0e7;hpb=f21bcfdca1cf55f420ac31ea933a93277a4f0458;p=collectd.git diff --git a/src/irq.c b/src/irq.c index 34e02df3..1168b979 100644 --- a/src/irq.c +++ b/src/irq.c @@ -1,6 +1,7 @@ /** * collectd - src/irq.c * Copyright (C) 2007 Peter Holik + * Copyright (C) 2011 Florian Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -24,227 +25,168 @@ #include "common.h" #include "plugin.h" #include "configfile.h" +#include "utils_ignorelist.h" -#define MODULE_NAME "irq" - -#if KERNEL_LINUX -# define IRQ_HAVE_READ 1 -#else -# define IRQ_HAVE_READ 0 +#if !KERNEL_LINUX +# error "No applicable input method." #endif -#define BUFSIZE 128 - /* * (Module-)Global variables */ -static char *irq_file = "irq-%s.rrd"; - -static char *config_keys[] = +static const char *config_keys[] = { "Irq", - "IgnoreSelected", - NULL + "IgnoreSelected" }; -static int config_keys_num = 2; - -static char *ds_def[] = -{ - "DS:irq:COUNTER:"COLLECTD_HEARTBEAT":0:U", - NULL -}; -static int ds_num = 1; - -static unsigned int *irq_list; -static unsigned int irq_list_num; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); -static int base = 10; +static ignorelist_t *ignorelist = NULL; -/* - * irq_list_action: - * 0 => default is to collect selected irqs - * 1 => ignore selcted irqs +/* + * Private functions */ -static int irq_list_action; - -static int irq_config (char *key, char *value) +static int irq_config (const char *key, const char *value) { - unsigned int *temp; - unsigned int irq; - char *endptr; + if (ignorelist == NULL) + ignorelist = ignorelist_create (/* invert = */ 1); if (strcasecmp (key, "Irq") == 0) { - temp = (unsigned int *) realloc (irq_list, (irq_list_num + 1) * sizeof (unsigned int *)); - if (temp == NULL) - { - syslog (LOG_EMERG, "Cannot allocate more memory."); - return (1); - } - irq_list = temp; - - irq = strtol(value, &endptr, base); - - if (endptr == value || - (errno == ERANGE && (irq == LONG_MAX || irq == LONG_MIN)) || - (errno != 0 && irq == 0)) - { - syslog (LOG_EMERG, "Irq value is not a number."); - return (1); - } - irq_list[irq_list_num] = irq; - irq_list_num++; + ignorelist_add (ignorelist, value); } else if (strcasecmp (key, "IgnoreSelected") == 0) { - if ((strcasecmp (value, "True") == 0) - || (strcasecmp (value, "Yes") == 0) - || (strcasecmp (value, "On") == 0)) - irq_list_action = 1; - else - irq_list_action = 0; + int invert = 1; + if (IS_TRUE (value)) + invert = 0; + ignorelist_set_invert (ignorelist, invert); } else { return (-1); } - return (0); -} - -/* - * Check if this interface/instance should be ignored. This is called from - * both, `submit' and `write' to give client and server the ability to - * ignore certain stuff.. - */ -static int check_ignore_irq (const unsigned int irq) -{ - int i; - - if (irq_list_num < 1) - return (0); - - for (i = 0; i < irq_list_num; i++) - if (irq == irq_list[i]) - return (irq_list_action); - - return (1 - irq_list_action); -} - -static void irq_write (char *host, char *inst, char *value) -{ - char file[BUFSIZE]; - int status; - - if (check_ignore_irq (atoi(inst))) - return; - status = snprintf (file, BUFSIZE, irq_file, inst); - if (status < 1) - return; - else if (status >= BUFSIZE) - return; - - rrd_update_file (host, file, value, ds_def, ds_num); + return (0); } -#if IRQ_HAVE_READ -static void irq_submit (unsigned int irq, unsigned int value, char *devices) +static void irq_submit (const char *irq_name, derive_t value) { - char buf[BUFSIZE]; - char desc[BUFSIZE]; - int status; - - if (check_ignore_irq (irq)) - return; - - status = snprintf (buf, BUFSIZE, "%u:%u", - (unsigned int) curtime, value); + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; - if ((status >= BUFSIZE) || (status < 1)) + if (ignorelist_match (ignorelist, irq_name) != 0) return; - status = snprintf (desc, BUFSIZE, "%d-%s", irq, devices); + values[0].derive = value; - if ((status >= BUFSIZE) || (status < 1)) - return; + vl.values = values; + vl.values_len = 1; + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "irq", sizeof (vl.plugin)); + sstrncpy (vl.type, "irq", sizeof (vl.type)); + sstrncpy (vl.type_instance, irq_name, sizeof (vl.type_instance)); - plugin_submit (MODULE_NAME, desc, buf); -} + plugin_dispatch_values (&vl); +} /* void irq_submit */ -static void irq_read (void) +static int irq_read (void) { -#if KERNEL_LINUX - -#undef BUFSIZE -#define BUFSIZE 256 - FILE *fh; - char buffer[BUFSIZE]; - unsigned int irq; - unsigned int irq_value; - long value; - char *ptr, *endptr; - - if ((fh = fopen ("/proc/interrupts", "r")) == NULL) + char buffer[1024]; + int cpu_count; + char *fields[256]; + + /* + * Example content: + * CPU0 CPU1 CPU2 CPU3 + * 0: 2574 1 3 2 IO-APIC-edge timer + * 1: 102553 158669 218062 70587 IO-APIC-edge i8042 + * 8: 0 0 0 1 IO-APIC-edge rtc0 + */ + fh = fopen ("/proc/interrupts", "r"); + if (fh == NULL) { - syslog (LOG_WARNING, "irq: fopen: %s", strerror (errno)); - return; + char errbuf[1024]; + ERROR ("irq plugin: fopen (/proc/interrupts): %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); } - while (fgets (buffer, BUFSIZE, fh) != NULL) + + /* Get CPU count from the first line */ + if(fgets (buffer, sizeof (buffer), fh) != NULL) { + cpu_count = strsplit (buffer, fields, + STATIC_ARRAY_SIZE (fields)); + } else { + ERROR ("irq plugin: unable to get CPU count from first line " + "of /proc/interrupts"); + return (-1); + } + + while (fgets (buffer, sizeof (buffer), fh) != NULL) { - errno = 0; /* To distinguish success/failure after call */ - irq = strtol(buffer, &endptr, base); + char *irq_name; + size_t irq_name_len; + derive_t irq_value; + int i; + int fields_num; + int irq_values_to_parse; + + fields_num = strsplit (buffer, fields, + STATIC_ARRAY_SIZE (fields)); + if (fields_num < 2) + continue; + + /* Parse this many numeric fields, skip the rest + * (+1 because first there is a name of irq in each line) */ + if (fields_num >= cpu_count + 1) + irq_values_to_parse = cpu_count; + else + irq_values_to_parse = fields_num - 1; - if (endptr == buffer || - (errno == ERANGE && (irq == LONG_MAX || irq == LONG_MIN)) || - (errno != 0 && irq == 0)) continue; + /* First field is irq name and colon */ + irq_name = fields[0]; + irq_name_len = strlen (irq_name); + if (irq_name_len < 2) + continue; - if (*endptr != ':') continue; + /* Check if irq name ends with colon. + * Otherwise it's a header. */ + if (irq_name[irq_name_len - 1] != ':') + continue; - ptr = ++endptr; + irq_name[irq_name_len - 1] = 0; + irq_name_len--; irq_value = 0; - /* sum irq's for all CPUs */ - while (1) + for (i = 1; i <= irq_values_to_parse; i++) { - errno = 0; - value = strtol(ptr, &endptr, base); - - if (endptr == ptr || - (errno == ERANGE && - (value == LONG_MAX || value == LONG_MIN)) || - (errno != 0 && value == 0)) break; - - irq_value += value; - ptr = endptr; - } - while (*ptr == ' ') ptr++; - while (*ptr && *ptr != ' ') ptr++; - while (*ptr == ' ') ptr++; + /* Per-CPU value */ + value_t v; + int status; - if (!*ptr) continue; + status = parse_value (fields[i], &v, DS_TYPE_DERIVE); + if (status != 0) + break; - endptr = ptr; + irq_value += v.derive; + } /* for (i) */ - while (*(++endptr)) - if (!isalnum(*endptr)) *endptr='_'; + /* No valid fields -> do not submit anything. */ + if (i <= 1) + continue; - ptr[strlen(ptr)-1] = '\0'; - - irq_submit (irq, irq_value, ptr); + irq_submit (irq_name, irq_value); } + fclose (fh); -#endif /* KERNEL_LINUX */ -} -#else -#define irq_read NULL -#endif /* IRQ_HAVE_READ */ + + return (0); +} /* int irq_read */ void module_register (void) { - plugin_register (MODULE_NAME, NULL, irq_read, irq_write); - cf_register (MODULE_NAME, irq_config, config_keys, config_keys_num); -} - -#undef BUFSIZE -#undef MODULE_NAME + plugin_register_config ("irq", irq_config, + config_keys, config_keys_num); + plugin_register_read ("irq", irq_read); +} /* void module_register */