X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fgraph_ident.c;h=abf396de3ba4417518cb52a49a53a534433f5039;hp=6111fe7f80b2d51ff375ed0eee9e52c783e5fc8f;hb=3fbe261b1de541590f5d3be1bef49b3b3605f392;hpb=0d346a62412563396fe2ad3e40066ed5c21a69ee diff --git a/src/graph_ident.c b/src/graph_ident.c index 6111fe7..abf396d 100644 --- a/src/graph_ident.c +++ b/src/graph_ident.c @@ -21,6 +21,8 @@ * Florian octo Forster **/ +#include "config.h" + #include #include #include @@ -30,9 +32,12 @@ #include /* PATH_MAX */ #include #include +#include +#include #include "graph_ident.h" #include "common.h" +#include "data_provider.h" #include "filesystem.h" #include "utils_cgi.h" @@ -502,34 +507,176 @@ char *ident_to_file (const graph_ident_t *ident) /* {{{ */ return (strdup (buffer)); } /* }}} char *ident_to_file */ -#define ADD_FIELD(field) do { \ - char json[1024]; \ - json_escape_copy (json, ident->field, sizeof (json)); \ - strlcat (buffer, json, sizeof (buffer)); \ +int ident_to_json (const graph_ident_t *ident, /* {{{ */ + yajl_gen handler) +{ + yajl_gen_status status; + + if ((ident == NULL) || (handler == NULL)) + return (EINVAL); + +#define ADD_STRING(str) do { \ + status = yajl_gen_string (handler, \ + (unsigned char *) (str), \ + (unsigned int) strlen (str)); \ + if (status != yajl_gen_status_ok) \ + return ((int) status); \ } while (0) -char *ident_to_json (const graph_ident_t *ident) /* {{{ */ + yajl_gen_map_open (handler); + ADD_STRING ("host"); + ADD_STRING (ident->host); + ADD_STRING ("plugin"); + ADD_STRING (ident->plugin); + ADD_STRING ("plugin_instance"); + ADD_STRING (ident->plugin_instance); + ADD_STRING ("type"); + ADD_STRING (ident->type); + ADD_STRING ("type_instance"); + ADD_STRING (ident->type_instance); + yajl_gen_map_close (handler); + +#undef ADD_FIELD + + return (0); +} /* }}} char *ident_to_json */ + +/* {{{ ident_data_to_json */ +struct ident_data_to_json__data_s +{ + dp_time_t begin; + dp_time_t end; + dp_time_t interval; + yajl_gen handler; +}; +typedef struct ident_data_to_json__data_s ident_data_to_json__data_t; + +#define yajl_gen_string_cast(h,s,l) \ + yajl_gen_string (h, (unsigned char *) s, (unsigned int) l) + +static int ident_data_to_json__get_ident_data ( + __attribute__((unused)) graph_ident_t *ident, /* {{{ */ + __attribute__((unused)) const char *ds_name, + dp_time_t first_value_time, dp_time_t interval, + size_t data_points_num, double *data_points, + void *user_data) { - char buffer[4096]; + ident_data_to_json__data_t *data = user_data; + size_t i; + + double first_value_time_double; + double interval_double; + double interval_requested; + size_t points_consolidate; + + first_value_time_double = ((double) first_value_time.tv_sec) + + (((double) first_value_time.tv_nsec) / 1000000000.0); + interval_double = ((double) interval.tv_sec) + + (((double) interval.tv_nsec) / 1000000000.0); + interval_requested = ((double) data->interval.tv_sec) + + (((double) data->interval.tv_nsec) / 1000000000.0); + + if (interval_requested < (2.0 * interval_double)) + points_consolidate = 1; + else + points_consolidate = (size_t) (interval_requested / interval_double); + assert (points_consolidate >= 1); - buffer[0] = 0; + if (points_consolidate > 1) + { + size_t offset = data_points_num % points_consolidate; - strlcat (buffer, "{\"host\":\"", sizeof (buffer)); - ADD_FIELD (host); - strlcat (buffer, "\",\"plugin\":\"", sizeof (buffer)); - ADD_FIELD (plugin); - strlcat (buffer, "\",\"plugin_instance\":\"", sizeof (buffer)); - ADD_FIELD (plugin_instance); - strlcat (buffer, "\",\"type\":\"", sizeof (buffer)); - ADD_FIELD (type); - strlcat (buffer, "\",\"type_instance\":\"", sizeof (buffer)); - ADD_FIELD (type_instance); - strlcat (buffer, "\"}", sizeof (buffer)); + first_value_time_double += ((double) offset) * interval_double; + interval_double *= ((double) points_consolidate); + } - return (strdup (buffer)); -} /* }}} char *ident_to_json */ + yajl_gen_map_open (data->handler); -#undef ADD_FIELD + yajl_gen_string_cast (data->handler, "first_value_time", strlen ("first_value_time")); + yajl_gen_double (data->handler, first_value_time_double); + + yajl_gen_string_cast (data->handler, "interval", strlen ("interval")); + yajl_gen_double (data->handler, interval_double); + + yajl_gen_string_cast (data->handler, "data", strlen ("data")); + yajl_gen_array_open (data->handler); + + for (i = (data_points_num % points_consolidate); + i < data_points_num; + i += points_consolidate) + { + size_t j; + + double sum = 0.0; + long num = 0; + + for (j = 0; j < points_consolidate; j++) + { + if (isnan (data_points[i+j])) + continue; + + sum += data_points[i+j]; + num++; + } + + if (num == 0) + yajl_gen_null (data->handler); + else + yajl_gen_double (data->handler, sum / ((double) num)); + } + + yajl_gen_array_close (data->handler); + + return (0); +} /* }}} int ident_data_to_json__get_ident_data */ + +/* Called for each DS name */ +static int ident_data_to_json__get_ds_name (graph_ident_t *ident, /* {{{ */ + const char *ds_name, void *user_data) +{ + ident_data_to_json__data_t *data = user_data; + int status; + + yajl_gen_map_open (data->handler); + + yajl_gen_string_cast (data->handler, "file", strlen ("file")); + ident_to_json (ident, data->handler); + + yajl_gen_string_cast (data->handler, "data_source", strlen ("data_source")); + yajl_gen_string_cast (data->handler, ds_name, strlen (ds_name)); + + status = data_provider_get_ident_data (ident, ds_name, + data->begin, data->end, + ident_data_to_json__get_ident_data, + data); + + yajl_gen_map_close (data->handler); + + return (status); +} /* }}} int ident_data_to_json__get_ds_name */ + +int ident_data_to_json (graph_ident_t *ident, /* {{{ */ + dp_time_t begin, dp_time_t end, dp_time_t res, + yajl_gen handler) +{ + ident_data_to_json__data_t data; + int status; + + data.begin = begin; + data.end = end; + data.interval = res; + data.handler = handler; + + /* Iterate over all DS names */ + status = data_provider_get_ident_ds_names (ident, + ident_data_to_json__get_ds_name, &data); + if (status != 0) + fprintf (stderr, "ident_data_to_json: data_provider_get_ident_ds_names " + "failed with status %i\n", status); + + return (status); +} /* }}} int ident_data_to_json */ +/* }}} ident_data_to_json */ int ident_describe (const graph_ident_t *ident, /* {{{ */ const graph_ident_t *selector,