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

diff --git a/src/graph_list.c b/src/graph_list.c
index b405476..ac4bfac 100644
--- a/src/graph_list.c
+++ b/src/graph_list.c
@@ -344,11 +344,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 +775,27 @@ 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_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)
 {
   size_t i;
 
@@ -799,6 +813,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,6 +1101,11 @@ int gl_update (_Bool request_served) /* {{{ */
   if ((status != 0)
       || ((gl_last_update + UPDATE_INTERVAL) < now))
   {
+    /* Clear state */
+    gl_clear_instances ();
+    gl_clear_hosts ();
+    gl_destroy (&gl_dynamic, &gl_dynamic_num);
+
     status = fs_scan (/* callback = */ gl_register_file,
         /* user data = */ NULL);
     gl_last_update = now;