X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftail_csv.c;h=2d794fc7880fccf310ce4e44b6179937b7657599;hb=2df75b141dc7474a72ce949bd0ce1ca5739e6fef;hp=a70b66589d287f4affef5003576e3583e1d55a8e;hpb=c7c13abc4c3c72b9baf58dfeec059c9c71e815ea;p=collectd.git diff --git a/src/tail_csv.c b/src/tail_csv.c index a70b6658..2d794fc7 100644 --- a/src/tail_csv.c +++ b/src/tail_csv.c @@ -33,23 +33,23 @@ #include struct metric_definition_s { - char *name; - char *type; - char *instance; - int data_source_type; - int value_from; + char *name; + char *type; + char *instance; + int data_source_type; + ssize_t value_from; struct metric_definition_s *next; }; typedef struct metric_definition_s metric_definition_t; struct instance_definition_s { - char *instance; - char *path; - cu_tail_t *tail; + char *instance; + char *path; + cu_tail_t *tail; metric_definition_t **metric_list; - size_t metric_list_len; - cdtime_t interval; - int time_from; + size_t metric_list_len; + cdtime_t interval; + ssize_t time_from; struct instance_definition_s *next; }; typedef struct instance_definition_s instance_definition_t; @@ -100,34 +100,37 @@ static int tcsv_read_metric (instance_definition_t *id, char **fields, size_t fields_num) { value_t v; - cdtime_t t; + cdtime_t t = 0; int status; if (md->data_source_type == -1) return (EINVAL); - if ((md->value_from >= fields_num) || (id->time_from >= fields_num)) + assert (md->value_from >= 0); + if (((size_t) md->value_from) >= fields_num) return (EINVAL); - t = 0; - if (id->time_from >= 0) - t = parse_time (fields[id->time_from]); - status = parse_value (fields[md->value_from], &v, md->data_source_type); if (status != 0) return (status); + if (id->time_from >= 0) { + if (((size_t) id->time_from) >= fields_num) + return (EINVAL); + t = parse_time (fields[id->time_from]); + } + return (tcsv_submit (id, md, v, t)); } -static _Bool tcsv_check_index (int index, size_t fields_num, char const *name) +static _Bool tcsv_check_index (ssize_t index, size_t fields_num, char const *name) { if (index < 0) return 1; else if (((size_t) index) < fields_num) return 1; - ERROR ("tail_csv plugin: Metric \"%s\": Request for index %i when " + ERROR ("tail_csv plugin: Metric \"%s\": Request for index %zd when " "only %zu fields are available.", name, index, fields_num); return (0); @@ -264,36 +267,32 @@ static void tcsv_metric_definition_destroy(void *arg){ tcsv_metric_definition_destroy (next); } -static int tcsv_config_get_index(oconfig_item_t *ci, int *ret_index) { - int index; - +static int tcsv_config_get_index(oconfig_item_t *ci, ssize_t *ret_index) { if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)){ WARNING("tail_csv plugin: The \"%s\" config option needs exactly one " "integer argument.", ci->key); return (-1); } - index = (int) ci->values[0].value.number; - if (index < 0) { + if (ci->values[0].value.number < 0) { WARNING("tail_csv plugin: The \"%s\" config option must be positive " "(or zero).", ci->key); return (-1); } - *ret_index = index; + *ret_index = (ssize_t) ci->values[0].value.number; return (0); } /* Parse metric */ static int tcsv_config_add_metric(oconfig_item_t *ci){ metric_definition_t *md; - int status = 0; + int status; int i; - md = (metric_definition_t *)malloc(sizeof(*md)); + md = calloc(1, sizeof(*md)); if (md == NULL) return (-1); - memset(md, 0, sizeof(*md)); md->name = NULL; md->type = NULL; md->instance = NULL; @@ -309,7 +308,6 @@ static int tcsv_config_add_metric(oconfig_item_t *ci){ for (i = 0; i < ci->children_num; ++i){ oconfig_item_t *option = ci->children + i; - status = 0; if (strcasecmp("Type", option->key) == 0) status = cf_util_get_string(option, &md->type); @@ -374,37 +372,42 @@ static void tcsv_instance_definition_destroy(void *arg){ sfree(id); } -static int tcsv_config_add_instance_collect(instance_definition_t *id, oconfig_item_t *ci){ +static int tcsv_config_add_instance_collect(instance_definition_t *id, oconfig_item_t *ci) { metric_definition_t *metric; + metric_definition_t **metric_list; + size_t metric_list_size; int i; - if (ci->values_num < 1){ + if (ci->values_num < 1) { WARNING("tail_csv plugin: The `Collect' config option needs at least one argument."); return (-1); } - /* Verify string arguments */ - for (i = 0; i < ci->values_num; ++i) - if (ci->values[i].type != OCONFIG_TYPE_STRING){ + metric_list_size = id->metric_list_len + (size_t) ci->values_num; + metric_list = realloc (id->metric_list, sizeof (*id->metric_list) * metric_list_size); + if (metric_list == NULL) + return (-1); + id->metric_list = metric_list; + + for (i = 0; i < ci->values_num; i++) { + char *metric_name; + + if (ci->values[i].type != OCONFIG_TYPE_STRING) { WARNING("tail_csv plugin: All arguments to `Collect' must be strings."); - return (-1); + continue; } + metric_name = ci->values[i].value.string; - id->metric_list = (metric_definition_t **)malloc(sizeof(metric_definition_t *) * ci->values_num); - if (id->metric_list == NULL) - return (-1); - - for (i = 0; i < ci->values_num; ++i){ for (metric = metric_head; metric != NULL; metric = metric->next) - if (strcasecmp(ci->values[i].value.string, metric->name) == 0) + if (strcasecmp(metric_name, metric->name) == 0) break; - if (metric == NULL){ - WARNING("tail_csv plugin: `Collect' argument not found `%s'.", ci->values[i].value.string); - return (-1); + if (metric == NULL) { + WARNING ("tail_csv plugin: `Collect' argument not found `%s'.", metric_name); + continue; } - id->metric_list[i] = metric; + id->metric_list[id->metric_list_len] = metric; id->metric_list_len++; } @@ -421,12 +424,10 @@ static int tcsv_config_add_file(oconfig_item_t *ci) /* Registration variables */ char cb_name[DATA_MAX_NAME_LEN]; user_data_t cb_data; - struct timespec cb_interval; - id = malloc(sizeof(*id)); + id = calloc(1, sizeof(*id)); if (id == NULL) return (-1); - memset(id, 0, sizeof(*id)); id->instance = NULL; id->path = NULL; id->metric_list = NULL; @@ -486,8 +487,7 @@ static int tcsv_config_add_file(oconfig_item_t *ci) memset(&cb_data, 0, sizeof(cb_data)); cb_data.data = id; cb_data.free_func = tcsv_instance_definition_destroy; - CDTIME_T_TO_TIMESPEC(id->interval, &cb_interval); - status = plugin_register_complex_read(NULL, cb_name, tcsv_read, &cb_interval, &cb_data); + status = plugin_register_complex_read(NULL, cb_name, tcsv_read, id->interval, &cb_data); if (status != 0){ ERROR("tail_csv plugin: Registering complex read function failed."); @@ -537,7 +537,7 @@ static int tcsv_init(void) { /* {{{ */ } else if (ds->ds_num != 1) { - ERROR ("tail_csv plugin: The type \"%s\" has %i data sources. " + ERROR ("tail_csv plugin: The type \"%s\" has %zu data sources. " "Only types with a single data soure are supported.", ds->type, ds->ds_num); continue;