X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fgraph_list.c;h=a0f0f29850932ecf4b51484b32591ed904455626;hp=b40547692441a39a39ea9e86b35fcdc9694cbd98;hb=f22da38d185608a0383da66e1c7d707b9cf5aebb;hpb=15fc8e0d4c830e05437ff068bb75a67fe5ea46b9

diff --git a/src/graph_list.c b/src/graph_list.c
index b405476..a0f0f29 100644
--- a/src/graph_list.c
+++ b/src/graph_list.c
@@ -75,6 +75,9 @@ static size_t host_list_len = 0;
 
 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
  */
@@ -209,6 +212,14 @@ static int gl_register_file (const graph_ident_t *file, /* {{{ */
   return (0);
 } /* }}} int gl_register_file */
 
+static int gl_register_ident (const 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)
 {
@@ -344,11 +355,6 @@ static int gl_update_cache (void) /* {{{ */
   return (0);
 } /* }}} int gl_update_cache */
 
-static int gl_scan_directory (void)
-{
-  return (-1);
-} /* }}} int gl_scan_directory */
-
 /*
  * JSON parsing functions
  */
@@ -780,8 +786,23 @@ int gl_config_submit (void) /* {{{ */
   return (0);
 } /* }}} int graph_config_submit */
 
-int gl_graph_get_all (graph_callback_t callback, /* {{{ */
-    void *user_data)
+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)
 {
   size_t i;
 
@@ -799,6 +820,9 @@ int gl_graph_get_all (graph_callback_t callback, /* {{{ */
       return (status);
   }
 
+  if (!include_dynamic)
+    return (0);
+
   for (i = 0; i < gl_dynamic_num; i++)
   {
     int status;
@@ -1084,8 +1108,21 @@ int gl_update (_Bool request_served) /* {{{ */
   if ((status != 0)
       || ((gl_last_update + UPDATE_INTERVAL) < now))
   {
-    status = fs_scan (/* callback = */ gl_register_file,
-        /* user data = */ NULL);
+    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);
+
     gl_last_update = now;
   }