diff --git a/src/dp_rrdtool.c b/src/dp_rrdtool.c
index b72e512c9fe9a2a570050889470d35cfb045cf15..d7ad5ba612360bb05a3853602176ab7594b8ef55 100644 (file)
--- a/src/dp_rrdtool.c
+++ b/src/dp_rrdtool.c
* Florian octo Forster <ff at octo.it>
**/
-#include "graph_types.h"
-#include "graph_ident.h"
-#include "graph_list.h"
-#include "data_provider.h"
-#include "filesystem.h"
-#include "oconfig.h"
-#include "common.h"
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <rrd.h>
+#include "graph_types.h"
+#include "graph_ident.h"
+#include "data_provider.h"
+#include "filesystem.h"
+#include "oconfig.h"
+#include "common.h"
+
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
+
struct dp_rrdtool_s
{
char *data_dir;
typedef struct dp_get_idents_data_s dp_get_idents_data_t;
static int scan_type_cb (__attribute__((unused)) const char *base_dir,
- const char *sub_dir, void *ud)
+ const char *file, void *ud)
{ /* {{{ */
dp_get_idents_data_t *data = ud;
- size_t sub_dir_len;
+ size_t file_len;
char type_copy[1024];
+ size_t type_copy_len;
char *type_inst;
- sub_dir_len = strlen (sub_dir);
- if (sub_dir_len < 5)
+ file_len = strlen (file);
+ if (file_len < 5)
return (0);
/* Ignore files that don't end in ".rrd". */
- if (strcasecmp (".rrd", sub_dir + (sub_dir_len - 4)) != 0)
+ if (strcasecmp (".rrd", file + (file_len - 4)) != 0)
return (0);
- strncpy (type_copy, sub_dir, sizeof (type_copy));
- type_copy[sub_dir_len - 4] = 0;
+ strncpy (type_copy, file, sizeof (type_copy));
+ type_copy_len = file_len - 4;
+ if (type_copy_len > (sizeof (type_copy) - 1))
+ type_copy_len = sizeof (type_copy) - 1;
+ type_copy[type_copy_len] = 0;
type_inst = strchr (type_copy, '-');
if (type_inst != NULL)
info = rrd_info (rrd_argc, rrd_argv);
if (info == NULL)
{
- printf ("%s: rrd_info (%s) failed.\n", __func__, file);
+ fprintf (stderr, "%s: rrd_info (%s) failed.\n", __func__, file);
+ fflush (stderr);
return (-1);
}
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);
unsigned long data_index;
unsigned long data_length;
+ dp_data_point_t *dp = NULL;
+ size_t dp_num = 0;
+
status = ident_to_rrdfile (ident, config, filename, sizeof (filename));
if (status != 0)
return (status);
free (ds_namv[i]); \
free (ds_namv); \
free (data); \
+ free (dp); \
return (ret_status); \
} while (0)
/* 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)
+ BAIL_OUT (ENOMEM);
+
for (data_index = 0; data_index < data_length; data_index++)
{
- dp_data_point_t dp;
unsigned long index = (ds_count * data_index) + ds_index;
- memset (&dp, 0, sizeof (dp));
- dp.time.tv_sec = rrd_start + (data_index * step);
- dp.time.tv_nsec = 0;
- dp.value = (double) data[index];
-
- status = (*cb) (ident, ds_name, &dp, ud);
- if (status != 0)
- BAIL_OUT (status);
+ 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];
}
+ status = (*cb) (ident, ds_name, dp, dp_num, ud);
+ if (status != 0)
+ BAIL_OUT (status);
+
BAIL_OUT (0);
#undef BAIL_OUT
} /* }}} int get_ident_data */
dp.private_data = conf;
- gl_register_data_provider ("rrdtool", &dp);
+ data_provider_register ("rrdtool", &dp);
return (0);
} /* }}} int dp_rrdtool_config */