X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=graph_list.c;h=965fcbac4f6caad5913b9a0097dd2937ec773ffb;hp=0a934776a7450ff5f72be38283334e03611e69af;hb=af2ed61b280e1ec169aba2bcb9df30ac76b006d2;hpb=99a0e023a458598597c2632cc4a8e4f3b2fd6b77

diff --git a/graph_list.c b/graph_list.c
index 0a93477..965fcba 100644
--- a/graph_list.c
+++ b/graph_list.c
@@ -5,11 +5,13 @@
 #include <string.h>
 #include <time.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "graph_list.h"
 #include "graph_ident.h"
+#include "graph_def.h"
+#include "graph_config.h"
 #include "common.h"
+#include "filesystem.h"
 #include "utils_params.h"
 
 #include <fcgiapp.h>
@@ -20,328 +22,58 @@
  */
 #define UPDATE_INTERVAL 10
 
-#define ANY_TOKEN "/any/"
-#define ALL_TOKEN "/all/"
-
-#define IS_ANY(str) (((str) != NULL) && (strcmp (ANY_TOKEN, (str)) == 0))
-#define IS_ALL(str) (((str) != NULL) && (strcmp (ALL_TOKEN, (str)) == 0))
-
-/*
- * Data types
- */
-struct gl_ident_stage_s /* {{{ */
-{
-  char *host;
-  char *plugin;
-  char *plugin_instance;
-  char *type;
-  char *type_instance;
-}; /* }}} */
-typedef struct gl_ident_stage_s gl_ident_stage_t;
-
-struct graph_instance_s /* {{{ */
-{
-  graph_ident_t *select;
-
-  graph_ident_t **files;
-  size_t files_num;
-
-  graph_instance_t *next;
-}; /* }}} struct graph_instance_s */
-
-struct graph_def_s;
-typedef struct graph_def_s graph_def_t;
-struct graph_def_s /* {{{ */
-{
-  graph_ident_t *select;
-
-  char *name;
-  char *legend;
-  double scale;
-  _Bool nan_to_zero;
-  _Bool draw_area;
-  uint32_t color;
-
-  graph_def_t *next;
-}; /* }}} struct graph_def_s */
-
-struct graph_config_s /* {{{ */
-{
-  graph_ident_t *select;
-
-  char *title;
-  char *vertical_label;
-
-  graph_instance_t *instances;
-
-  graph_config_t *next;
-}; /* }}} struct graph_config_s */
-
 /*
  * Global variables
  */
-static graph_config_t *graph_config_head = NULL;
+static graph_config_t **gl_active = NULL;
+static size_t gl_active_num = 0;
+
+static graph_config_t **gl_staging = NULL;
+static size_t gl_staging_num = 0;
 
 static time_t gl_last_update = 0;
 
 /*
  * Private functions
  */
-/* FIXME: These "print_*" functions are used for debugging. They should be
- * removed at some point. */
-static int print_files (const graph_instance_t *inst) /* {{{ */
-{
-  size_t i;
-
-  for (i = 0; i < inst->files_num; i++)
-  {
-    graph_ident_t *ident = inst->files[i];
-    char *file;
-
-    file = ident_to_file (ident);
-    printf ("    File \"%s\"\n", file);
-    free (file);
-  }
-
-  return (0);
-} /* }}} int print_instances */
-
-static int print_instances (const graph_config_t *cfg) /* {{{ */
-{
-  graph_instance_t *inst;
-
-  for (inst = cfg->instances; inst != NULL; inst = inst->next)
-  {
-    char *str;
-
-    str = ident_to_string (inst->select);
-    printf ("  Instance \"%s\"\n", str);
-    free (str);
-
-    print_files (inst);
-  }
-
-  return (0);
-} /* }}} int print_instances */
-
-static int print_graphs (void) /* {{{ */
-{
-  graph_config_t *cfg;
-
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
-  {
-    char *str;
-
-    str = ident_to_string (cfg->select);
-    printf ("Graph \"%s\"\n", str);
-    free (str);
-
-    print_instances (cfg);
-  }
-
-  return (0);
-} /* }}} int print_graphs */
-
-#if 0
-/* "Safe" version of strcmp(3): Either or both pointers may be NULL. */
-static int strcmp_s (const char *s1, const char *s2) /* {{{ */
+int gl_add_graph_internal (graph_config_t *cfg, /* {{{ */
+    graph_config_t ***gl_array, size_t *gl_array_num)
 {
-  if ((s1 == NULL) && (s2 == NULL))
-    return (0);
-  else if (s1 == NULL)
-    return (1);
-  else if (s2 == NULL)
-    return (-1);
-  assert ((s1 != NULL) && (s2 != NULL));
-
-  return (strcmp (s1, s2));
-} /* }}} int strcmp_s */
-#endif
-
-static void instance_destroy (graph_instance_t *inst) /* {{{ */
-{
-  graph_instance_t *next;
-  size_t i;
-
-  if (inst == NULL)
-    return;
-
-  next = inst->next;
-
-  ident_destroy (inst->select);
-
-  for (i = 0; i < inst->files_num; i++)
-    ident_destroy (inst->files[i]);
-  free (inst->files);
-
-  free (inst);
+  graph_config_t **tmp;
 
-  instance_destroy (next);
-} /* }}} void instance_destroy */
-
-static void graph_destroy (graph_config_t *cfg) /* {{{ */
-{
-  graph_config_t *next;
+#define ARRAY_PTR  (*gl_array)
+#define ARRAY_SIZE (*gl_array_num)
 
   if (cfg == NULL)
-    return;
-
-  next = cfg->next;
-
-  ident_destroy (cfg->select);
-
-  free (cfg->title);
-  free (cfg->vertical_label);
-
-  instance_destroy (cfg->instances);
-
-  graph_destroy (next);
-} /* }}} void graph_destroy */
-
-/*
- * Copy part of an identifier. If the "template" value is ANY_TOKEN, "value" is
- * copied and returned. This function is used when creating graph_instance_t
- * from graph_config_t.
- */
-static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */
-    const graph_ident_t *file)
-{
-  graph_instance_t *i;
-
-  if ((cfg == NULL) || (file == NULL))
-    return (NULL);
-
-  i = malloc (sizeof (*i));
-  if (i == NULL)
-    return (NULL);
-  memset (i, 0, sizeof (*i));
-
-  i->select = ident_copy_with_selector (cfg->select, file,
-      /* keep_all_selector = */ 1);
-
-  i->files = NULL;
-  i->files_num = 0;
-
-  i->next = NULL;
-
-  if (cfg->instances == NULL)
-    cfg->instances = i;
-  else
-  {
-    graph_instance_t *last;
-
-    last = cfg->instances;
-    while (last->next != NULL)
-      last = last->next;
-
-    last->next = i;
-  }
-
-  return (i);
-} /* }}} graph_instance_t *instance_create */
-
-static int instance_add_file (graph_instance_t *inst, /* {{{ */
-    const graph_ident_t *file)
-{
-  graph_ident_t **tmp;
+    return (EINVAL);
 
-  tmp = realloc (inst->files, sizeof (*inst->files) * (inst->files_num + 1));
+  tmp = realloc (ARRAY_PTR, sizeof (*ARRAY_PTR) * (ARRAY_SIZE + 1));
   if (tmp == NULL)
     return (ENOMEM);
-  inst->files = tmp;
-
-  inst->files[inst->files_num] = ident_clone (file);
-  if (inst->files[inst->files_num] == NULL)
-    return (ENOMEM);
-
-  inst->files_num++;
-
-  return (0);
-} /* }}} int instance_add_file */
-
-static graph_instance_t *graph_find_instance (graph_config_t *cfg, /* {{{ */
-    const graph_ident_t *file)
-{
-  graph_instance_t *i;
-
-  if ((cfg == NULL) || (file == NULL))
-    return (NULL);
-
-  for (i = cfg->instances; i != NULL; i = i->next)
-    if (ident_matches (i->select, file))
-      return (i);
-
-  return (NULL);
-} /* }}} graph_instance_t *graph_find_instance */
-
-static int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
-{
-  graph_instance_t *inst;
-
-  inst = graph_find_instance (cfg, file);
-  if (inst == NULL)
-  {
-    inst = instance_create (cfg, file);
-    if (inst == NULL)
-      return (ENOMEM);
-  }
-
-  return (instance_add_file (inst, file));
-} /* }}} int graph_add_file */
+  ARRAY_PTR = tmp;
 
-static int graph_append (graph_config_t *cfg) /* {{{ */
-{
-  graph_config_t *last;
+  ARRAY_PTR[ARRAY_SIZE] = cfg;
+  ARRAY_SIZE++;
 
-  if (cfg == NULL)
-    return (EINVAL);
-
-  if (graph_config_head == NULL)
-  {
-    graph_config_head = cfg;
-    return (0);
-  }
-
-  last = graph_config_head;
-  while (last->next != NULL)
-    last = last->next;
-
-  last->next = cfg;
+#undef ARRAY_SIZE
+#undef ARRAY_PTR
 
   return (0);
-} /* }}} int graph_append */
+} /* }}} int gl_add_graph_internal */
 
-static int graph_create_from_file (const graph_ident_t *file) /* {{{ */
-{
-  graph_config_t *cfg;
-
-  cfg = malloc (sizeof (*cfg));
-  if (cfg == NULL)
-    return (ENOMEM);
-  memset (cfg, 0, sizeof (*cfg));
-
-  cfg->select = ident_clone (file);
-
-  cfg->title = NULL;
-  cfg->vertical_label = NULL;
-  cfg->instances = NULL;
-  cfg->next = NULL;
-
-  graph_append (cfg);
-
-  return (graph_add_file (cfg, file));
-} /* }}} int graph_create_from_file */
-
-static int register_file (const graph_ident_t *file) /* {{{ */
+static int gl_register_file (const graph_ident_t *file, /* {{{ */
+    __attribute__((unused)) void *user_data)
 {
   graph_config_t *cfg;
   int num_graphs = 0;
+  size_t i;
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  for (i = 0; i < gl_active_num; i++)
   {
+    graph_config_t *cfg = gl_active[i];
     int status;
 
-    if (!ident_matches (cfg->select, file))
+    if (!graph_matches (cfg, file))
       continue;
 
     status = graph_add_file (cfg, file);
@@ -356,175 +88,14 @@ static int register_file (const graph_ident_t *file) /* {{{ */
   }
 
   if (num_graphs == 0)
-    graph_create_from_file (file);
-
-  return (0);
-} /* }}} int register_file */
-
-static int FIXME_graph_create_from_file (const char *host, /* {{{ */
-    const char *plugin, const char *plugin_instance,
-    const char *type, const char *type_instance,
-    const char *title)
-{
-  graph_config_t *cfg;
-
-  cfg = malloc (sizeof (*cfg));
-  if (cfg == NULL)
-    return (ENOMEM);
-  memset (cfg, 0, sizeof (*cfg));
-
-  cfg->select = ident_create (host, plugin, plugin_instance, type, type_instance);
-
-  cfg->title = NULL;
-  if (title != NULL)
-    cfg->title = strdup (title);
-  cfg->vertical_label = NULL;
-  cfg->instances = NULL;
-  cfg->next = NULL;
-
-  graph_append (cfg);
-
-  return (0);
-} /* }}} int FIXME_graph_create_from_file */
-
-/* FIXME: Actually read the config file here. */
-static int read_graph_config (void) /* {{{ */
-{
-  if (graph_config_head != NULL)
-    return (0);
-
-  FIXME_graph_create_from_file (ANY_TOKEN, "cpu", ANY_TOKEN, "cpu", ALL_TOKEN,
-      "CPU {instance} usage");
-  FIXME_graph_create_from_file (ANY_TOKEN, "memory", "", "memory", ALL_TOKEN,
-      "Memory usage");
-  FIXME_graph_create_from_file (ANY_TOKEN, "swap", "", "swap", ALL_TOKEN,
-      "Swap");
-  FIXME_graph_create_from_file (ANY_TOKEN, ANY_TOKEN, ANY_TOKEN, "ps_state", ALL_TOKEN,
-      "Processes");
-  FIXME_graph_create_from_file (ANY_TOKEN, "cpu", ALL_TOKEN, "cpu", "idle",
-      "CPU idle overview");
-
-  return (0);
-} /* }}} int read_graph_config */
-
-static void gl_clear (void) /* {{{ */
-{
-  graph_config_t *cfg;
-
-  cfg = graph_config_head;
-  graph_config_head = NULL;
-  graph_destroy (cfg);
-
-  gl_last_update = 0;
-} /* }}} void gl_clear */
-
-static int callback_type (const char *type, void *user_data) /* {{{ */
-{
-  gl_ident_stage_t *gl;
-  graph_ident_t *ident;
-  int status;
-
-  if ((type == NULL) || (user_data == NULL))
-    return (EINVAL);
-
-  gl = user_data;
-  if ((gl->type != NULL) || (gl->type_instance != NULL))
-    return (EINVAL);
-
-  gl->type = strdup (type);
-  if (gl->type == NULL)
-    return (ENOMEM);
-
-  gl->type_instance = strchr (gl->type, '-');
-  if (gl->type_instance != NULL)
-  {
-    *gl->type_instance = 0;
-    gl->type_instance++;
-  }
-  else
-  {
-    gl->type_instance = gl->type + strlen (gl->type);
-  }
-
-  ident = ident_create (gl->host,
-      gl->plugin, gl->plugin_instance,
-      gl->type, gl->type_instance);
-  if (ident == 0)
-  {
-    status = -1;
-  }
-  else
-  {
-    status = register_file (ident);
-    ident_destroy (ident);
-  }
-
-  free (gl->type);
-  gl->type = NULL;
-  gl->type_instance = NULL;
-
-  return (status);
-} /* }}} int callback_type */
-
-static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
-{
-  gl_ident_stage_t *gl;
-  int status;
-
-  if ((plugin == NULL) || (user_data == NULL))
-    return (EINVAL);
-
-  gl = user_data;
-  if ((gl->plugin != NULL) || (gl->plugin_instance != NULL))
-    return (EINVAL);
-
-  gl->plugin = strdup (plugin);
-  if (gl->plugin == NULL)
-    return (ENOMEM);
-
-  gl->plugin_instance = strchr (gl->plugin, '-');
-  if (gl->plugin_instance != NULL)
   {
-    *gl->plugin_instance = 0;
-    gl->plugin_instance++;
+    cfg = graph_create (file);
+    gl_add_graph_internal (cfg, &gl_active, &gl_active_num);
+    graph_add_file (cfg, file);
   }
-  else
-  {
-    gl->plugin_instance = gl->plugin + strlen (gl->plugin);
-  }
-
-  status = foreach_type (gl->host, plugin, callback_type, gl);
-
-  free (gl->plugin);
-  gl->plugin = NULL;
-  gl->plugin_instance = NULL;
-
-  return (status);
-} /* }}} int callback_plugin */
-
-static int callback_host (const char *host, void *user_data) /* {{{ */
-{
-  gl_ident_stage_t *gl;
-  int status;
 
-  if ((host == NULL) || (user_data == NULL))
-    return (EINVAL);
-
-  gl = user_data;
-  if (gl->host != NULL)
-    return (EINVAL);
-
-  gl->host = strdup (host);
-  if (gl->host == NULL)
-    return (ENOMEM);
-
-  status =  foreach_plugin (host, callback_plugin, gl);
-
-  free (gl->host);
-  gl->host = NULL;
-
-  return (status);
-} /* }}} int callback_host */
+  return (0);
+} /* }}} int gl_register_file */
 
 static const char *get_part_from_param (const char *prim_key, /* {{{ */
     const char *sec_key)
@@ -538,185 +109,65 @@ static const char *get_part_from_param (const char *prim_key, /* {{{ */
   return (param (sec_key));
 } /* }}} const char *get_part_from_param */
 
-int gl_ident_get_rrdargs (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst,
-    graph_ident_t *ident,
-    str_array_t *args)
+static int gl_clear_instances (void) /* {{{ */
 {
-  char *file;
-  char **dses = NULL;
-  size_t dses_num = 0;
-  int status;
   size_t i;
 
-  if ((cfg == NULL) || (inst == NULL) || (ident == NULL) || (args == NULL))
-    return (EINVAL);
-
-  file = ident_to_file (ident);
-  if (file == NULL)
-  {
-    DEBUG ("gl_ident_get_rrdargs: ident_to_file returned NULL.\n");
-    return (-1);
-  }
-
-  DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file);
-
-  status = ds_list_from_rrd_file (file, &dses_num, &dses);
-  if (status != 0)
-  {
-    free (file);
-    return (status);
-  }
-
-  for (i = 0; i < dses_num; i++)
-  {
-    int index;
-
-    DEBUG ("gl_ident_get_rrdargs: ds[%lu] = %s;\n", (unsigned long) i, dses[i]);
-
-    index = array_argc (args);
-
-    /* CDEFs */
-    array_append_format (args, "DEF:def_%04i_min=%s:%s:MIN",
-        index, file, dses[i]);
-    array_append_format (args, "DEF:def_%04i_avg=%s:%s:AVERAGE",
-        index, file, dses[i]);
-    array_append_format (args, "DEF:def_%04i_max=%s:%s:MAX",
-        index, file, dses[i]);
-    /* VDEFs */
-    array_append_format (args, "VDEF:vdef_%04i_min=def_%04i_min,MINIMUM",
-        index, index);
-    array_append_format (args, "VDEF:vdef_%04i_avg=def_%04i_avg,AVERAGE",
-        index, index);
-    array_append_format (args, "VDEF:vdef_%04i_max=def_%04i_max,MAXIMUM",
-        index, index);
-    array_append_format (args, "VDEF:vdef_%04i_lst=def_%04i_avg,LAST",
-        index, index);
-
-    /* Graph part */
-    array_append_format (args, "LINE1:def_%04i_avg#%06"PRIx32":%s",
-        index, get_random_color (), dses[i]);
-    array_append_format (args, "GPRINT:vdef_%04i_min:%%lg min,", index);
-    array_append_format (args, "GPRINT:vdef_%04i_avg:%%lg avg,", index);
-    array_append_format (args, "GPRINT:vdef_%04i_max:%%lg max,", index);
-    array_append_format (args, "GPRINT:vdef_%04i_lst:%%lg last\\l", index);
-
-    free (dses[i]);
-  }
-  free (dses);
-
-  free (file);
+  for (i = 0; i < gl_active_num; i++)
+    graph_clear_instances (gl_active[i]);
 
   return (0);
-} /* }}} int gl_ident_get_rrdargs */
+} /* }}} int gl_clear_instances */
+
 
 /*
  * Global functions
  */
-int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
-    char *buffer, size_t buffer_size)
+int gl_add_graph (graph_config_t *cfg) /* {{{ */
 {
-  if ((inst == NULL) || (buffer == NULL) || (buffer_size < 1))
-    return (EINVAL);
-
-  buffer[0] = 0;
-
-#define COPY_FIELD(field) do {                                  \
-  const char *cfg_f  = ident_get_##field (cfg->select);         \
-  const char *inst_f = ident_get_##field (inst->select);        \
-  if (strcmp (cfg_f, inst_f) == 0)                              \
-  {                                                             \
-    strlcat (buffer, #field, buffer_size);                      \
-    strlcat (buffer, "=", buffer_size);                         \
-    strlcat (buffer, cfg_f, buffer_size);                       \
-  }                                                             \
-  else                                                          \
-  {                                                             \
-    strlcat (buffer, "graph_", buffer_size);                    \
-    strlcat (buffer, #field, buffer_size);                      \
-    strlcat (buffer, "=", buffer_size);                         \
-    strlcat (buffer, cfg_f, buffer_size);                       \
-    strlcat (buffer, ";", buffer_size);                         \
-    strlcat (buffer, "inst_", buffer_size);                     \
-    strlcat (buffer, #field, buffer_size);                      \
-    strlcat (buffer, "=", buffer_size);                         \
-    strlcat (buffer, inst_f, buffer_size);                      \
-  }                                                             \
-} while (0)
-
-  COPY_FIELD(host);
-  strlcat (buffer, ";", buffer_size);
-  COPY_FIELD(plugin);
-  strlcat (buffer, ";", buffer_size);
-  COPY_FIELD(plugin_instance);
-  strlcat (buffer, ";", buffer_size);
-  COPY_FIELD(type);
-  strlcat (buffer, ";", buffer_size);
-  COPY_FIELD(type_instance);
-
-#undef COPY_FIELD
+  return (gl_add_graph_internal (cfg, &gl_staging, &gl_staging_num));
+} /* }}} int gl_add_graph */
 
-  return (0);
-} /* }}} int gl_instance_get_params */
-
-graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */
+int gl_config_submit (void) /* {{{ */
 {
-  const char *host = get_part_from_param ("inst_host", "host");
-  const char *plugin = get_part_from_param ("inst_plugin", "plugin");
-  const char *plugin_instance = get_part_from_param ("inst_plugin_instance", "plugin_instance");
-  const char *type = get_part_from_param ("inst_type", "type");
-  const char *type_instance = get_part_from_param ("inst_type_instance", "type_instance");
-  graph_ident_t *ident;
-  graph_instance_t *inst;
+  graph_config_t **old;
+  size_t old_num;
+  size_t i;
 
-  if (cfg == NULL)
-    cfg = graph_get_selected ();
+  old = gl_active;
+  old_num = gl_active_num;
 
-  if (cfg == NULL)
-  {
-    DEBUG ("inst_get_selected: cfg == NULL;\n");
-    return (NULL);
-  }
+  gl_active = gl_staging;
+  gl_active_num = gl_staging_num;
 
-  if ((host == NULL)
-      || (plugin == NULL) || (plugin_instance == NULL)
-      || (type == NULL) || (type_instance == NULL))
-  {
-    DEBUG ("inst_get_selected: A parameter is NULL.\n");
-    return (NULL);
-  }
-
-  ident = ident_create (host, plugin, plugin_instance, type, type_instance);
+  gl_staging = NULL;
+  gl_staging_num = 0;
 
-  for (inst = cfg->instances; inst != NULL; inst = inst->next)
+  for (i = 0; i < old_num; i++)
   {
-    if (ident_compare (ident, inst->select) != 0)
-      continue;
-
-    ident_destroy (ident);
-    return (inst);
+    graph_destroy (old[i]);
+    old[i] = NULL;
   }
+  free (old);
 
-  DEBUG ("inst_get_selected: No match found.\n");
-  ident_destroy (ident);
-  return (NULL);
-} /* }}} graph_instance_t *inst_get_selected */
+  return (0);
+} /* }}} int graph_config_submit */
 
 int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
     void *user_data)
 {
-  graph_config_t *cfg;
+  size_t i;
 
   if (callback == NULL)
     return (EINVAL);
 
   gl_update ();
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  for (i = 0; i < gl_active_num; i++)
   {
     int status;
 
-    status = (*callback) (cfg, user_data);
+    status = (*callback) (gl_active[i], user_data);
     if (status != 0)
       return (status);
   }
@@ -724,7 +175,7 @@ int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
   return (0);
 } /* }}} int gl_graph_get_all */
 
-graph_config_t *graph_get_selected (void) /* {{{ */
+graph_config_t *gl_graph_get_selected (void) /* {{{ */
 {
   const char *host = get_part_from_param ("graph_host", "host");
   const char *plugin = get_part_from_param ("graph_plugin", "plugin");
@@ -732,7 +183,7 @@ graph_config_t *graph_get_selected (void) /* {{{ */
   const char *type = get_part_from_param ("graph_type", "type");
   const char *type_instance = get_part_from_param ("graph_type_instance", "type_instance");
   graph_ident_t *ident;
-  graph_config_t *cfg;
+  size_t i;
 
   if ((host == NULL)
       || (plugin == NULL) || (plugin_instance == NULL)
@@ -743,136 +194,75 @@ graph_config_t *graph_get_selected (void) /* {{{ */
 
   gl_update ();
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  for (i = 0; i < gl_active_num; i++)
   {
-    if (ident_compare (ident, cfg->select) != 0)
+    if (graph_compare (gl_active[i], ident) != 0)
       continue;
 
     ident_destroy (ident);
-    return (cfg);
+    return (gl_active[i]);
   }
 
   ident_destroy (ident);
   return (NULL);
-} /* }}} graph_config_t *graph_get_selected */
+} /* }}} graph_config_t *gl_graph_get_selected */
 
-int gl_graph_instance_get_all (graph_config_t *cfg, /* {{{ */
-    gl_inst_callback callback, void *user_data)
+/* gl_instance_get_all, gl_graph_instance_get_all {{{ */
+struct gl_inst_callback_data /* {{{ */
 {
-  graph_instance_t *inst;
-
-  if ((cfg == NULL) || (callback == NULL))
-    return (EINVAL);
+  graph_config_t *cfg;
+  gl_inst_callback callback;
+  void *user_data;
+}; /* }}} struct gl_inst_callback_data */
 
-  for (inst = cfg->instances; inst != NULL; inst = inst->next)
-  {
-    int status;
+static int gl_inst_callback_handler (graph_instance_t *inst, /* {{{ */
+    void *user_data)
+{
+  struct gl_inst_callback_data *data = user_data;
 
-    status = (*callback) (cfg, inst, user_data);
-    if (status != 0)
-      return (status);
-  }
+  return ((*data->callback) (data->cfg, inst, data->user_data));
+} /* }}} int gl_inst_callback_handler */
 
-  return (0);
-} /* }}} int gl_graph_instance_get_all */
-
-int gl_graph_get_title (graph_config_t *cfg, /* {{{ */
-    char *buffer, size_t buffer_size)
+int gl_graph_instance_get_all (graph_config_t *cfg, /* {{{ */
+    gl_inst_callback callback, void *user_data)
 {
-  char *str;
+  struct gl_inst_callback_data data =
+  {
+    cfg,
+    callback,
+    user_data
+  };
 
-  if ((cfg == NULL) || (buffer == NULL) || (buffer_size < 1))
+  if ((cfg == NULL) || (callback == NULL))
     return (EINVAL);
 
-  if (cfg->title != NULL)
-    str = cfg->title;
-  else
-    str = ident_to_string (cfg->select);
-
-  if (str == NULL)
-    return (ENOMEM);
-
-  strncpy (buffer, str, buffer_size);
-  buffer[buffer_size - 1] = 0;
-
-  free (str);
-
-  return (0);
-} /* }}} int gl_graph_get_title */
-
-graph_ident_t *gl_graph_get_selector (graph_config_t *cfg) /* {{{ */
-{
-  if (cfg == NULL)
-    return (NULL);
-
-  return (ident_clone (cfg->select));
-} /* }}} graph_ident_t *gl_graph_get_selector */
+  return (inst_foreach (graph_get_instances (cfg),
+        gl_inst_callback_handler, &data));
+} /* }}} int gl_graph_instance_get_all */
 
 int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
     void *user_data)
 {
-  graph_config_t *cfg;
-
-  gl_update ();
-
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
-  {
-    graph_instance_t *inst;
-
-    for (inst = cfg->instances; inst != NULL; inst = inst->next)
-    {
-      int status;
-
-      status = (*callback) (cfg, inst, user_data);
-      if (status != 0)
-        return (status);
-    }
-  }
-
-  return (0);
-} /* }}} int gl_instance_get_all */
-
-int gl_instance_get_rrdargs (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst,
-    str_array_t *args)
-{
   size_t i;
 
-  if ((cfg == NULL) || (inst == NULL) || (args == NULL))
-    return (EINVAL);
-
-  if (cfg->title != NULL)
-  {
-    array_append (args, "-t");
-    array_append (args, cfg->title);
-  }
+  gl_update ();
 
-  for (i = 0; i < inst->files_num; i++)
+  for (i = 0; i < gl_active_num; i++)
   {
     int status;
 
-    status = gl_ident_get_rrdargs (cfg, inst, inst->files[i], args);
+    status = gl_graph_instance_get_all (gl_active[i], callback, user_data);
     if (status != 0)
       return (status);
   }
 
   return (0);
-} /* }}} int gl_instance_get_rrdargs */
-
-graph_ident_t *gl_instance_get_selector (graph_instance_t *inst) /* {{{ */
-{
-  if (inst == NULL)
-    return (NULL);
-
-  return (ident_clone (inst->select));
-} /* }}} graph_ident_t *gl_instance_get_selector */
-
-/* DELETEME */
+} /* }}} int gl_instance_get_all */
+/* }}} gl_instance_get_all, gl_graph_instance_get_all */
 
 int gl_update (void) /* {{{ */
 {
   time_t now;
-  gl_ident_stage_t gl;
   int status;
 
   /*
@@ -884,20 +274,12 @@ int gl_update (void) /* {{{ */
   if ((gl_last_update + UPDATE_INTERVAL) >= now)
     return (0);
 
-  gl_clear ();
-
-  read_graph_config ();
-
-  memset (&gl, 0, sizeof (gl));
-  gl.host = NULL;
-  gl.plugin = NULL;
-  gl.plugin_instance = NULL;
-  gl.type = NULL;
-  gl.type_instance = NULL;
+  graph_read_config ();
 
-  status = foreach_host (callback_host, &gl);
+  gl_clear_instances ();
+  status = fs_scan (/* callback = */ gl_register_file, /* user data = */ NULL);
 
-  /* print_graphs (); */
+  gl_last_update = now;
 
   return (status);
 } /* }}} int gl_update */