X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Firq.c;h=0c363795c8e46a3d308799113431aafaa3db499f;hb=a5377cf935630082f2eac2e5f4a538844cc06c8d;hp=94e425371dfed11dc68a8fdd27dc912d6187d12a;hpb=6bd4bf7b21f84746010792b885b9b71791dccb79;p=collectd.git diff --git a/src/irq.c b/src/irq.c index 94e42537..0c363795 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 @@ -21,16 +22,16 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" #include "configfile.h" +#include "utils_ignorelist.h" #if !KERNEL_LINUX # error "No applicable input method." #endif -#define BUFSIZE 128 - /* * (Module-)Global variables */ @@ -41,88 +42,41 @@ static const char *config_keys[] = }; static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); -static unsigned int *irq_list; -static unsigned int irq_list_num; +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 (const char *key, const char *value) { + if (ignorelist == NULL) + ignorelist = ignorelist_create (/* invert = */ 1); + if (strcasecmp (key, "Irq") == 0) { - unsigned int *temp; - unsigned int irq; - char *endptr; - - temp = (unsigned int *) realloc (irq_list, (irq_list_num + 1) * sizeof (unsigned int *)); - if (temp == NULL) - { - fprintf (stderr, "irq plugin: Cannot allocate more memory.\n"); - ERROR ("irq plugin: Cannot allocate more memory."); - return (1); - } - irq_list = temp; - - /* Clear errno, because we need it to see if an error occured. */ - errno = 0; - - irq = strtol(value, &endptr, 10); - if ((endptr == value) || (errno != 0)) - { - fprintf (stderr, "irq plugin: Irq value is not a " - "number: `%s'\n", value); - ERROR ("irq plugin: Irq value is not a " - "number: `%s'", value); - return (1); - } - irq_list[irq_list_num] = irq; - irq_list_num++; + ignorelist_add (ignorelist, value); } else if (strcasecmp (key, "IgnoreSelected") == 0) { + int invert = 1; if (IS_TRUE (value)) - irq_list_action = 1; - else - irq_list_action = 0; + 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; (unsigned int)i < irq_list_num; i++) - if (irq == irq_list[i]) - return (irq_list_action); - - return (1 - irq_list_action); + return (0); } -static void irq_submit (unsigned int irq, derive_t value) +static void irq_submit (const char *irq_name, derive_t value) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - int status; - if (check_ignore_irq (irq)) + if (ignorelist_match (ignorelist, irq_name) != 0) return; values[0].derive = value; @@ -132,11 +86,7 @@ static void irq_submit (unsigned int irq, derive_t value) sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "irq", sizeof (vl.plugin)); sstrncpy (vl.type, "irq", sizeof (vl.type)); - - status = ssnprintf (vl.type_instance, sizeof (vl.type_instance), - "%u", irq); - if ((status < 1) || ((unsigned int)status >= sizeof (vl.type_instance))) - return; + sstrncpy (vl.type_instance, irq_name, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); } /* void irq_submit */ @@ -145,7 +95,16 @@ static int irq_read (void) { FILE *fh; 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) { @@ -155,28 +114,58 @@ static int irq_read (void) 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"); + fclose (fh); + return (-1); + } + + while (fgets (buffer, sizeof (buffer), fh) != NULL) { - unsigned int irq; + char *irq_name; + size_t irq_name_len; derive_t irq_value; - char *endptr; int i; - - char *fields[64]; int fields_num; + int irq_values_to_parse; - fields_num = strsplit (buffer, fields, 64); + fields_num = strsplit (buffer, fields, + STATIC_ARRAY_SIZE (fields)); if (fields_num < 2) continue; - errno = 0; /* To distinguish success/failure after call */ - irq = (unsigned int) strtoul (fields[0], &endptr, /* base = */ 10); + /* 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; + + /* First field is irq name and colon */ + irq_name = fields[0]; + irq_name_len = strlen (irq_name); + if (irq_name_len < 2) + continue; + + /* Check if irq name ends with colon. + * Otherwise it's a header. */ + if (irq_name[irq_name_len - 1] != ':') + continue; - if ((endptr == fields[0]) || (errno != 0) || (*endptr != ':')) + /* Is it the the ARM fast interrupt (FIQ)? */ + if (irq_name_len == 4 && (strncmp(irq_name, "FIQ:", 4) == 0)) continue; + irq_name[irq_name_len - 1] = 0; + irq_name_len--; + irq_value = 0; - for (i = 1; i < fields_num; i++) + for (i = 1; i <= irq_values_to_parse; i++) { /* Per-CPU value */ value_t v; @@ -189,10 +178,11 @@ static int irq_read (void) irq_value += v.derive; } /* for (i) */ - if (i < fields_num) + /* No valid fields -> do not submit anything. */ + if (i <= 1) continue; - irq_submit (irq, irq_value); + irq_submit (irq_name, irq_value); } fclose (fh); @@ -206,5 +196,3 @@ void module_register (void) config_keys, config_keys_num); plugin_register_read ("irq", irq_read); } /* void module_register */ - -#undef BUFSIZE