diff --git a/src/graph_list.c b/src/graph_list.c
index ac4bfac78a3082e76293e98637a497c088142aaa..b969d4ce2481a794e83997a5f8c7207bac0c6787 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"
return (0);
} /* }}} int gl_register_file */
+static int gl_register_ident (graph_ident_t *ident, /* {{{ */
+ __attribute__((unused)) void *user_data)
+{
+ /* TODO: Check for duplicates if multiple data providers are used. */
+
+ return (gl_register_file (ident, user_data));
+} /* }}} int gl_register_ident */
+
static const char *get_part_from_param (const char *prim_key, /* {{{ */
const char *sec_key)
{
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_ident (const char *provider, const graph_ident_t *ident) /* {{{ */
-{
- char *ident_str = ident_to_string (ident);
-
- fprintf (stderr, "gl_register_ident (provider = %s, ident = %s)\n",
- provider, ident_str);
-
- free (ident_str);
- return (0);
-} /* }}} int gl_register_ident */
-
-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);
-
- return (0);
-} /* }}} int gl_register_data_provider */
-
int gl_graph_get_all (_Bool include_dynamic, /* {{{ */
graph_callback_t callback, void *user_data)
{
gl_clear_hosts ();
gl_destroy (&gl_dynamic, &gl_dynamic_num);
- status = fs_scan (/* callback = */ gl_register_file,
- /* user data = */ NULL);
+ data_provider_get_idents (gl_register_ident, /* user data = */ NULL);
+
gl_last_update = now;
}