From: Florian Forster Date: Fri, 2 Sep 2011 22:48:47 +0000 (+0200) Subject: Merge "curl_json plugin: Be more clever building the type instance." into collectd... X-Git-Tag: collectd-4.10.4~4 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a647c3cf89a0221e4803887bd3731042edf5498f;hp=aadd789f6b154f24ea8af09c59a7d98512873806;p=collectd.git Merge "curl_json plugin: Be more clever building the type instance." into collectd-4.10 --- diff --git a/src/irq.c b/src/irq.c index 401cc6f9..70d6b5ab 100644 --- a/src/irq.c +++ b/src/irq.c @@ -29,8 +29,6 @@ # error "No applicable input method." #endif -#define BUFSIZE 128 - /* * (Module-)Global variables */ @@ -41,8 +39,8 @@ 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 char **irq_list; +static unsigned int irq_list_num = 0; /* * irq_list_action: @@ -55,11 +53,9 @@ static int irq_config (const char *key, const char *value) { if (strcasecmp (key, "Irq") == 0) { - unsigned int *temp; - unsigned int irq; - char *endptr; + char **temp; - temp = (unsigned int *) realloc (irq_list, (irq_list_num + 1) * sizeof (unsigned int *)); + temp = realloc (irq_list, (irq_list_num + 1) * sizeof (*irq_list)); if (temp == NULL) { fprintf (stderr, "irq plugin: Cannot allocate more memory.\n"); @@ -68,19 +64,13 @@ static int irq_config (const char *key, const char *value) } 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)) + irq_list[irq_list_num] = strdup (value); + if (irq_list[irq_list_num] == NULL) { - fprintf (stderr, "irq plugin: Irq value is not a " - "number: `%s'\n", value); - ERROR ("irq plugin: Irq value is not a " - "number: `%s'", value); + ERROR ("irq plugin: strdup(3) failed."); return (1); } - irq_list[irq_list_num] = irq; + irq_list_num++; } else if (strcasecmp (key, "IgnoreSelected") == 0) @@ -102,27 +92,26 @@ static int irq_config (const char *key, const char *value) * both, `submit' and `write' to give client and server the ability to * ignore certain stuff.. */ -static int check_ignore_irq (const unsigned int irq) +static int check_ignore_irq (const char *irq) { - int i; + unsigned int i; if (irq_list_num < 1) return (0); - for (i = 0; (unsigned int)i < irq_list_num; i++) - if (irq == irq_list[i]) + for (i = 0; i < irq_list_num; i++) + if (strcmp (irq, irq_list[i]) == 0) return (irq_list_action); return (1 - irq_list_action); } -static void irq_submit (unsigned int irq, counter_t value) +static void irq_submit (const char *irq_name, counter_t value) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - int status; - if (check_ignore_irq (irq)) + if (check_ignore_irq (irq_name)) return; values[0].counter = value; @@ -132,23 +121,15 @@ static void irq_submit (unsigned int irq, counter_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 */ static int irq_read (void) { -#undef BUFSIZE -#define BUFSIZE 256 - FILE *fh; - char buffer[BUFSIZE]; - unsigned int irq; + char buffer[1024]; unsigned long long irq_value; unsigned long long value; char *endptr; @@ -164,32 +145,48 @@ static int irq_read (void) sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } - while (fgets (buffer, BUFSIZE, fh) != NULL) + while (fgets (buffer, sizeof (buffer), fh) != NULL) { + char *irq_name; + size_t irq_name_len; + fields_num = strsplit (buffer, fields, 64); if (fields_num < 2) continue; - errno = 0; /* To distinguish success/failure after call */ - irq = strtol (fields[0], &endptr, 10); + irq_name = fields[0]; + irq_name_len = strlen (irq_name); + if (irq_name_len < 2) + continue; - if ((endptr == fields[0]) || (errno != 0) || (*endptr != ':')) + /* Check if irq name ends with colon. + * Otherwise it's a header. */ + if (irq_name[irq_name_len - 1] != ':') continue; + irq_name[irq_name_len - 1] = 0; + irq_name_len--; + irq_value = 0; for (i = 1; i < fields_num; i++) { errno = 0; + endptr = NULL; value = strtoull (fields[i], &endptr, 10); - if ((*endptr != '\0') || (errno != 0)) + /* Ignore all fields following a non-numeric field. */ + if ((errno != 0) || (endptr == NULL) || (*endptr != 0)) break; irq_value += value; } /* for (i) */ + /* No valid fields -> do not submit anything. */ + if (i <= 1) + continue; + /* Force 32bit wrap-around */ - irq_submit (irq, irq_value % 4294967296ULL); + irq_submit (irq_name, irq_value % 4294967296ULL); } fclose (fh); @@ -203,5 +200,3 @@ void module_register (void) config_keys, config_keys_num); plugin_register_read ("irq", irq_read); } /* void module_register */ - -#undef BUFSIZE diff --git a/src/processes.c b/src/processes.c index bab7080f..d56be25b 100644 --- a/src/processes.c +++ b/src/processes.c @@ -121,13 +121,6 @@ # define ARG_MAX 4096 #endif -static const char *config_keys[] = -{ - "Process", - "ProcessMatch" -}; -static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); - typedef struct procstat_entry_s { unsigned long id; @@ -520,42 +513,61 @@ static void ps_list_reset (void) } /* put all pre-defined 'Process' names from config to list_head_g tree */ -static int ps_config (const char *key, const char *value) +static int ps_config (oconfig_item_t *ci) { - if (strcasecmp (key, "Process") == 0) - { - ps_list_register (value, NULL); - } - else if (strcasecmp (key, "ProcessMatch") == 0) - { - char *new_val; - char *fields[3]; - int fields_num; - - new_val = strdup (value); - if (new_val == NULL) { - ERROR ("processes plugin: strdup failed when processing " - "`ProcessMatch %s'.", value); - return (1); + int i; + + for (i = 0; i < ci->children_num; ++i) { + oconfig_item_t *c = ci->children + i; + + if (strcasecmp (c->key, "Process") == 0) + { + if ((c->values_num != 1) + || (OCONFIG_TYPE_STRING != c->values[0].type)) { + ERROR ("processes plugin: `Process' expects exactly " + "one string argument (got %i).", + c->values_num); + continue; + } + + if (c->children_num != 0) { + WARNING ("processes plugin: the `Process' config option " + "does not expect any child elements -- ignoring " + "content (%i elements) of the block.", + c->children_num, c->values[0].value.string); + } + + ps_list_register (c->values[0].value.string, NULL); } + else if (strcasecmp (c->key, "ProcessMatch") == 0) + { + if ((c->values_num != 2) + || (OCONFIG_TYPE_STRING != c->values[0].type) + || (OCONFIG_TYPE_STRING != c->values[1].type)) + { + ERROR ("processes plugin: `ProcessMatch' needs exactly " + "two string arguments (got %i).", + c->values_num); + continue; + } - fields_num = strsplit (new_val, fields, - STATIC_ARRAY_SIZE (fields)); - if (fields_num != 2) + if (c->children_num != 0) { + WARNING ("processes plugin: the `ProcessMatch' config option " + "does not expect any child elements -- ignoring " + "content (%i elements) of the " + "block.", c->children_num, c->values[0].value.string, + c->values[1].value.string); + } + + ps_list_register (c->values[0].value.string, + c->values[1].value.string); + } + else { - ERROR ("processes plugin: `ProcessMatch' needs exactly " - "two string arguments."); - sfree (new_val); - return (1); + ERROR ("processes plugin: The `%s' configuration option is not " + "understood and will be ignored.", c->key); + continue; } - ps_list_register (fields[0], fields[1]); - sfree (new_val); - } - else - { - ERROR ("processes plugin: The `%s' configuration option is not " - "understood and will be ignored.", key); - return (-1); } return (0); @@ -1827,8 +1839,7 @@ static int ps_read (void) void module_register (void) { - plugin_register_config ("processes", ps_config, - config_keys, config_keys_num); + plugin_register_complex_config ("processes", ps_config); plugin_register_init ("processes", ps_init); plugin_register_read ("processes", ps_read); } /* void module_register */