X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftail_csv.c;h=bb9b58aceaa1edc459bbf7220f581c5e796997db;hb=d38c16d60f9d1b10cb60f010ce086135e6ecbe07;hp=dc89f0d70b01c10a8d2941d754c80326d4cf31f7;hpb=c842ed2091ed748da35295856d5c4a1042291a17;p=collectd.git diff --git a/src/tail_csv.c b/src/tail_csv.c index dc89f0d7..bb9b58ac 100644 --- a/src/tail_csv.c +++ b/src/tail_csv.c @@ -33,22 +33,23 @@ #include struct metric_definition_s { - char *name; - char *type; - char *instance; - int data_source_type; - int index; + 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; + 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; @@ -99,24 +100,42 @@ 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->index >= fields_num) + assert (md->value_from >= 0); + if (((size_t) md->value_from) >= fields_num) return (EINVAL); - t = parse_time (fields[0]); - - status = parse_value (fields[md->index], &v, md->data_source_type); + 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 (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 %zd when " + "only %zu fields are available.", + name, index, fields_num); + return (0); +} + static int tcsv_read_buffer (instance_definition_t *id, char *buffer, size_t buffer_size) { @@ -178,12 +197,9 @@ static int tcsv_read_buffer (instance_definition_t *id, for (i = 0; i < id->metric_list_len; ++i){ metric_definition_t *md = id->metric_list[i]; - if (((size_t) md->index) >= metrics_num) { - ERROR ("tail_csv plugin: Metric \"%s\": Request for index %i when " - "only %zu fields are available.", - md->name, md->index, metrics_num); + if (!tcsv_check_index (md->value_from, metrics_num, md->name) + || !tcsv_check_index (id->time_from, metrics_num, md->name)) continue; - } tcsv_read_metric (id, md, metrics, metrics_num); } @@ -251,25 +267,27 @@ static void tcsv_metric_definition_destroy(void *arg){ tcsv_metric_definition_destroy (next); } -static int tcsv_config_add_metric_index(metric_definition_t *md, oconfig_item_t *ci){ +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: `Index' needs exactly one integer argument."); + WARNING("tail_csv plugin: The \"%s\" config option needs exactly one " + "integer argument.", ci->key); return (-1); } - md->index = (int)ci->values[0].value.number; - if (md->index <= 0){ - WARNING("tail_csv plugin: `Index' must be higher than 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 = (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)); @@ -280,6 +298,7 @@ static int tcsv_config_add_metric(oconfig_item_t *ci){ md->type = NULL; md->instance = NULL; md->data_source_type = -1; + md->value_from = -1; md->next = NULL; status = cf_util_get_string (ci, &md->name); @@ -290,14 +309,13 @@ 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); else if (strcasecmp("Instance", option->key) == 0) status = cf_util_get_string(option, &md->instance); - else if (strcasecmp("Index", option->key) == 0) - status = tcsv_config_add_metric_index(md, option); + else if (strcasecmp("ValueFrom", option->key) == 0) + status = tcsv_config_get_index (option, &md->value_from); else { WARNING("tail_csv plugin: Option `%s' not allowed here.", option->key); status = -1; @@ -316,8 +334,8 @@ static int tcsv_config_add_metric(oconfig_item_t *ci){ if (md->type == NULL) { WARNING("tail_csv plugin: Option `Type' must be set."); status = -1; - } else if (md->index == 0) { - WARNING("tail_csv plugin: Option `Index' must be set."); + } else if (md->value_from < 0) { + WARNING("tail_csv plugin: Option `ValueFrom' must be set."); status = -1; } if (status != 0) { @@ -325,9 +343,6 @@ static int tcsv_config_add_metric(oconfig_item_t *ci){ return (status); } - DEBUG ("tail_csv plugin: md = { name = %s, type = %s, index = %d }", - md->name, md->type, md->index); - if (metric_head == NULL) metric_head = md; else { @@ -348,7 +363,8 @@ static void tcsv_instance_definition_destroy(void *arg){ if (id == NULL) return; - cu_tail_destroy (id->tail); + if (id->tail != NULL) + cu_tail_destroy (id->tail); id->tail = NULL; sfree(id->instance); @@ -357,37 +373,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++; } @@ -404,7 +425,6 @@ 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)); if (id == NULL) @@ -413,6 +433,7 @@ static int tcsv_config_add_file(oconfig_item_t *ci) id->instance = NULL; id->path = NULL; id->metric_list = NULL; + id->time_from = -1; id->next = NULL; status = cf_util_get_string (ci, &id->path); @@ -434,6 +455,8 @@ static int tcsv_config_add_file(oconfig_item_t *ci) status = tcsv_config_add_instance_collect(id, option); else if (strcasecmp("Interval", option->key) == 0) cf_util_get_cdtime(option, &id->interval); + else if (strcasecmp("TimeFrom", option->key) == 0) + status = tcsv_config_get_index (option, &id->time_from); else { WARNING("tail_csv plugin: Option `%s' not allowed here.", option->key); status = -1; @@ -466,8 +489,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."); @@ -517,7 +539,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;