#include <rrd.h>
#include "graph_types.h"
+#include "graph_config.h"
#include "graph_ident.h"
#include "data_provider.h"
#include "filesystem.h"
continue;
keylen = strlen (ptr->key);
- if (keylen < strlen ("ds[?].index"))
+ if (keylen < strlen ("ds[?].type"))
continue;
- dslen = keylen - strlen ("ds[].index");
+ dslen = keylen - strlen ("ds[].type");
assert (dslen >= 1);
- if (strcmp ("].index", ptr->key + (strlen ("ds[") + dslen)) != 0)
+ if (strcmp ("].type", ptr->key + (strlen ("ds[") + dslen)) != 0)
continue;
ds = malloc (dslen + 1);
rrd_value_t *data;
int status;
- unsigned long ds_index;
- unsigned long data_index;
- unsigned long data_length;
+ dp_time_t first_value_time;
+ dp_time_t interval;
+ size_t data_points_num;
+ double *data_points = NULL;
- dp_data_point_t *dp = NULL;
- size_t dp_num = 0;
+ unsigned long ds_index;
+ size_t i;
status = ident_to_rrdfile (ident, config, filename, sizeof (filename));
if (status != 0)
free (ds_namv[i]); \
free (ds_namv); \
free (data); \
- free (dp); \
+ free (data_points); \
return (ret_status); \
} while (0)
if (ds_index >= ds_count)
BAIL_OUT (ENOENT);
- /* Number of data points returned. */
- data_length = (rrd_end - rrd_start) / step;
-
- dp_num = (size_t) data_length;
- dp = calloc (dp_num, sizeof (*dp));
- if (dp == NULL)
+ memset (&first_value_time, 0, sizeof (first_value_time));
+ first_value_time.tv_sec = rrd_start;
+ memset (&interval, 0, sizeof (interval));
+ interval.tv_sec = (time_t) step;
+ data_points_num = (size_t) ((rrd_end - rrd_start) / step);
+ data_points = calloc (data_points_num, sizeof (*data_points));
+ if (data_points == NULL)
BAIL_OUT (ENOMEM);
- for (data_index = 0; data_index < data_length; data_index++)
+ for (i = 0; i < data_points_num; i++)
{
- unsigned long index = (ds_count * data_index) + ds_index;
-
- dp[data_index].time.tv_sec = rrd_start + (data_index * step);
- dp[data_index].time.tv_nsec = 0;
- dp[data_index].value = (double) data[index];
+ unsigned long index = (ds_count * ((unsigned long) i)) + ds_index;
+ data_points[i] = (double) data[index];
}
- status = (*cb) (ident, ds_name, dp, dp_num, ud);
+ status = (*cb) (ident, ds_name, first_value_time, interval,
+ data_points_num, data_points, ud);
if (status != 0)
BAIL_OUT (status);
int dp_rrdtool_config (const oconfig_item_t *ci)
{ /* {{{ */
dp_rrdtool_t *conf;
+ int i;
data_provider_t dp =
{
/* private_data = */ NULL
};
- /* FIXME: Actuelly do config parsing here. */
- ci = NULL; /* FIXME */
- conf = malloc (sizeof (dp_rrdtool_t));
- conf->data_dir = strdup ("/var/lib/collectd/rrd");
+ conf = malloc (sizeof (*conf));
+ if (conf == NULL)
+ return (ENOMEM);
+ memset (conf, 0, sizeof (*conf));
+ conf->data_dir = NULL;
+
+ for (i = 0; i < ci->children_num; i++)
+ {
+ oconfig_item_t *child = ci->children + i;
+
+ if (strcasecmp ("DataDir", child->key) == 0)
+ graph_config_get_string (child, &conf->data_dir);
+ else
+ {
+ fprintf (stderr, "dp_rrdtool_config: Ignoring unknown config option "
+ "\"%s\"\n", child->key);
+ fflush (stderr);
+ }
+ }
+
+ if (conf->data_dir == NULL)
+ conf->data_dir = strdup ("/var/lib/collectd/rrd");
+ if (conf->data_dir == NULL)
+ {
+ free (conf);
+ return (ENOMEM);
+ }
dp.private_data = conf;