diff --git a/src/graph_ident.c b/src/graph_ident.c
index 9c8bc6e2ed6e6be999e051a22fc069a1df152d99..02e1aaa3f74518075f2e8cdd558b25bf32ef15eb 100644 (file)
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
static int ident_data_to_json__get_ident_data (
__attribute__((unused)) graph_ident_t *ident, /* {{{ */
__attribute__((unused)) const char *ds_name,
static int ident_data_to_json__get_ident_data (
__attribute__((unused)) graph_ident_t *ident, /* {{{ */
__attribute__((unused)) const char *ds_name,
- const dp_data_point_t *dp, size_t dp_num,
+ dp_time_t first_value_time, dp_time_t interval,
+ size_t data_points_num, double *data_points,
void *user_data)
{
ident_data_to_json__data_t *data = user_data;
size_t i;
void *user_data)
{
ident_data_to_json__data_t *data = user_data;
size_t i;
+ double first_value_time_double;
+ double interval_double;
+
+ /* TODO: Make points_num_limit configurable. */
+ /* points_num_limit: The number of data-points to send at least. */
+ size_t points_num_limit = 400;
+ 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);
+
+ if (data_points_num <= points_num_limit)
+ points_consolidate = 1;
+ else
+ points_consolidate = data_points_num / points_num_limit;
+
+ if (points_consolidate > 1)
+ {
+ size_t offset = data_points_num % points_consolidate;
+
+ first_value_time_double += ((double) offset) * interval_double;
+ interval_double *= ((double) points_consolidate);
+ }
+
+ yajl_gen_map_open (data->handler);
+
+ 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);
yajl_gen_array_open (data->handler);
- for (i = 0; i < dp_num; i++)
+ for (i = (data_points_num % points_consolidate);
+ i < data_points_num;
+ i += points_consolidate)
{
{
- yajl_gen_array_open (data->handler);
- yajl_gen_integer (data->handler, (long) dp[i].time.tv_sec);
- if (isnan (dp[i].value))
+ 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_null (data->handler);
else
- yajl_gen_double (data->handler, dp[i].value);
- yajl_gen_array_close (data->handler);
+ yajl_gen_double (data->handler, sum / ((double) num));
}
yajl_gen_array_close (data->handler);
}
yajl_gen_array_close (data->handler);
} /* }}} int ident_data_to_json__get_ident_data */
/* Called for each DS name */
} /* }}} int ident_data_to_json__get_ident_data */
/* Called for each DS name */
-static int ident_data_to_json__get_ds_name (const graph_ident_t *ident, /* {{{ */
+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;
const char *ds_name, void *user_data)
{
ident_data_to_json__data_t *data = user_data;
@@ -588,24 +637,23 @@ static int ident_data_to_json__get_ds_name (const graph_ident_t *ident, /* {{{ *
yajl_gen_map_open (data->handler);
yajl_gen_map_open (data->handler);
- yajl_gen_string_cast (data->handler, "ds_name", strlen ("ds_name"));
- yajl_gen_string_cast (data->handler, ds_name, strlen (ds_name));
+ yajl_gen_string_cast (data->handler, "file", strlen ("file"));
+ ident_to_json (ident, data->handler);
- yajl_gen_string_cast (data->handler, "data", strlen ("data"));
- yajl_gen_array_open (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);
status = data_provider_get_ident_data (ident, ds_name,
data->begin, data->end,
ident_data_to_json__get_ident_data,
data);
- yajl_gen_array_close (data->handler);
yajl_gen_map_close (data->handler);
return (status);
} /* }}} int ident_data_to_json__get_ds_name */
yajl_gen_map_close (data->handler);
return (status);
} /* }}} int ident_data_to_json__get_ds_name */
-int ident_data_to_json (const graph_ident_t *ident, /* {{{ */
+int ident_data_to_json (graph_ident_t *ident, /* {{{ */
dp_time_t begin, dp_time_t end,
yajl_gen handler)
{
dp_time_t begin, dp_time_t end,
yajl_gen handler)
{