diff --git a/src/graph_list.c b/src/graph_list.c
index a0f0f29850932ecf4b51484b32591ed904455626..d767ef945585198691fd737c2d2de5c750f5eb9b 100644 (file)
--- a/src/graph_list.c
+++ b/src/graph_list.c
#include "graph_list.h"
#include "common.h"
+#include "data_provider.h"
#include "filesystem.h"
#include "graph.h"
#include "graph_config.h"
static time_t gl_last_update = 0;
-/* TODO: Turn this into an array for multiple data providers. */
-static data_provider_t *data_provider = NULL;
-
/*
* Private functions
*/
if (status == 0)
{
if (statbuf.st_mtime >= gl_last_update)
- {
- fprintf (stderr, "gl_update_cache: Not writing to cache because it's "
- "at least as new as our internal data\n");
+ /* Not writing to cache because it's at least as new as our internal data */
return (0);
- }
}
else
{
return (0);
} /* }}} int graph_config_submit */
-int gl_register_data_provider (const char *name, data_provider_t *p) /* {{{ */
-{
- fprintf (stderr, "gl_register_data_provider (name = %s, ptr = %p)\n",
- name, (void *) p);
-
- if (data_provider == NULL)
- data_provider = malloc (sizeof (*data_provider));
- if (data_provider == NULL)
- return (ENOMEM);
-
- *data_provider = *p;
-
- return (0);
-} /* }}} int gl_register_data_provider */
-
int gl_graph_get_all (_Bool include_dynamic, /* {{{ */
graph_callback_t callback, void *user_data)
{
if ((status != 0)
|| ((gl_last_update + UPDATE_INTERVAL) < now))
{
- if (data_provider == NULL)
- {
- fprintf (stderr, "No data provider has been registered\n");
- return (ENOENT);
- }
-
/* Clear state */
gl_clear_instances ();
gl_clear_hosts ();
gl_destroy (&gl_dynamic, &gl_dynamic_num);
- /* TODO: Iterate over all data providers */
- data_provider->get_idents (data_provider->private_data,
- gl_register_ident, /* user data = */ NULL);
+ data_provider_get_idents (gl_register_ident, /* user data = */ NULL);
gl_last_update = now;
}