X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=graph_list.c;h=c9fbbaba72d72c011bd398520ce5bb0b7a7b8d7b;hb=4732be36d1fd60fe5047ffe1e2d903403d691a8b;hp=389a03b2a3e86530f2c1e97eb0b75797e4d5698f;hpb=d71d8d8cf6e5c90dd29bd5f84cf1d12da8cbf2da;p=collection4.git

diff --git a/graph_list.c b/graph_list.c
index 389a03b..c9fbbab 100644
--- a/graph_list.c
+++ b/graph_list.c
@@ -1,17 +1,22 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
 #include <assert.h>
 
-#include <fcgiapp.h>
-#include <fcgi_stdio.h>
-
 #include "graph_list.h"
+#include "graph_ident.h"
+#include "graph_def.h"
+#include "graph_config.h"
 #include "common.h"
 #include "utils_params.h"
 
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
+
 /*
  * Defines
  */
@@ -23,20 +28,21 @@
 /*
  * Data types
  */
-struct graph_ident_s /* {{{ */
+struct gl_ident_stage_s /* {{{ */
 {
   char *host;
   char *plugin;
   char *plugin_instance;
   char *type;
   char *type_instance;
-}; /* }}} struct graph_ident_s */
+}; /* }}} */
+typedef struct gl_ident_stage_s gl_ident_stage_t;
 
 struct graph_instance_s /* {{{ */
 {
-  graph_ident_t select;
+  graph_ident_t *select;
 
-  graph_ident_t *files;
+  graph_ident_t **files;
   size_t files_num;
 
   graph_instance_t *next;
@@ -44,23 +50,31 @@ struct graph_instance_s /* {{{ */
 
 struct graph_config_s /* {{{ */
 {
-  graph_ident_t select;
+  graph_ident_t *select;
 
   char *title;
   char *vertical_label;
 
+  graph_def_t *defs;
+
   graph_instance_t *instances;
 
   graph_config_t *next;
 }; /* }}} struct graph_config_s */
 
+struct def_callback_data_s
+{
+  graph_instance_t *inst;
+  str_array_t *args;
+};
+typedef struct def_callback_data_s def_callback_data_t;
+
 /*
  * Global variables
  */
 static graph_config_t *graph_config_head = NULL;
+static graph_config_t *graph_config_staging = NULL;
 
-static graph_ident_t *graph_list = NULL;
-static size_t graph_list_length = 0;
 static time_t gl_last_update = 0;
 
 /*
@@ -74,12 +88,12 @@ static int print_files (const graph_instance_t *inst) /* {{{ */
 
   for (i = 0; i < inst->files_num; i++)
   {
-    graph_ident_t *file = inst->files + i;
+    graph_ident_t *ident = inst->files[i];
+    char *file;
 
-    printf ("    File \"%s/%s-%s/%s-%s\"\n",
-        file->host,
-        file->plugin, file->plugin_instance,
-        file->type, file->type_instance);
+    file = ident_to_file (ident);
+    printf ("    File \"%s\"\n", file);
+    free (file);
   }
 
   return (0);
@@ -91,10 +105,11 @@ static int print_instances (const graph_config_t *cfg) /* {{{ */
 
   for (inst = cfg->instances; inst != NULL; inst = inst->next)
   {
-    printf ("  Instance \"%s/%s-%s/%s-%s\"\n",
-        inst->select.host,
-        inst->select.plugin, inst->select.plugin_instance,
-        inst->select.type, inst->select.type_instance);
+    char *str;
+
+    str = ident_to_string (inst->select);
+    printf ("  Instance \"%s\"\n", str);
+    free (str);
 
     print_files (inst);
   }
@@ -108,10 +123,11 @@ static int print_graphs (void) /* {{{ */
 
   for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
   {
-    printf ("Graph \"%s/%s-%s/%s-%s\"\n",
-        cfg->select.host,
-        cfg->select.plugin, cfg->select.plugin_instance,
-        cfg->select.type, cfg->select.type_instance);
+    char *str;
+
+    str = ident_to_string (cfg->select);
+    printf ("Graph \"%s\"\n", str);
+    free (str);
 
     print_instances (cfg);
   }
@@ -119,6 +135,7 @@ static int print_graphs (void) /* {{{ */
   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) /* {{{ */
 {
@@ -132,88 +149,34 @@ static int strcmp_s (const char *s1, const char *s2) /* {{{ */
 
   return (strcmp (s1, s2));
 } /* }}} int strcmp_s */
+#endif
 
-static _Bool part_matches (const char *sel, const char *val) /* {{{ */
+static void instance_destroy (graph_instance_t *inst) /* {{{ */
 {
-  if ((sel == NULL) && (val == NULL))
-    return (1);
-
-  if (sel == NULL) /* && (val != NULL) */
-    return (0);
-
-  if ((strcasecmp (ALL_TOKEN, sel) == 0)
-      || (strcasecmp (ANY_TOKEN, sel) == 0))
-    return (1);
-
-  if (val == NULL) /* && (sel != NULL) */
-    return (0);
-
-  if (strcmp (sel, val) == 0)
-    return (1);
-
-  return (0);
-} /* }}} _Bool part_matches */
-
-static _Bool file_matches (const graph_ident_t *sel, /* {{{ */
-    const graph_ident_t *val)
-{
-  if ((sel == NULL) && (val == NULL))
-    return (0);
-  else if (sel == NULL)
-    return (-1);
-  else if (val == NULL)
-    return (1);
+  graph_instance_t *next;
+  size_t i;
 
-  if (!part_matches (sel->host, val->host))
-    return (0);
+  if (inst == NULL)
+    return;
 
-  if (!part_matches (sel->plugin, val->plugin))
-    return (0);
+  next = inst->next;
 
-  if (!part_matches (sel->plugin_instance, val->plugin_instance))
-    return (0);
+  ident_destroy (inst->select);
 
-  if (!part_matches (sel->type, val->type))
-    return (0);
+  for (i = 0; i < inst->files_num; i++)
+    ident_destroy (inst->files[i]);
+  free (inst->files);
 
-  if (!part_matches (sel->type_instance, val->type_instance))
-    return (0);
+  free (inst);
 
-  return (1);
-} /* }}} _Bool ident_compare */
+  instance_destroy (next);
+} /* }}} void instance_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 char *identifier_copy_part (const char *template, const char *value) /* {{{ */
-{
-  if (template == NULL)
-  {
-    return (NULL);
-  }
-  else if (strcasecmp (ANY_TOKEN, template) == 0)
-  {
-    /* ANY in the graph selection => concrete value in the instance. */
-    if (value == NULL)
-      return (NULL);
-    else
-      return (strdup (value));
-  }
-  else if (strcasecmp (ALL_TOKEN, template) == 0)
-  {
-    /* ALL in the graph selection => ALL in the instance. */
-    return (strdup (ALL_TOKEN));
-  }
-  else
-  {
-    assert (value != NULL);
-    assert (strcmp (template, value) == 0);
-    return (strdup (template));
-  }
-} /* }}} int identifier_copy_part */
-
 static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */
     const graph_ident_t *file)
 {
@@ -227,13 +190,14 @@ static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */
     return (NULL);
   memset (i, 0, sizeof (*i));
 
-  i->select.host = identifier_copy_part (cfg->select.host, file->host);
-  i->select.plugin = identifier_copy_part (cfg->select.plugin, file->plugin);
-  i->select.plugin_instance = identifier_copy_part (cfg->select.plugin_instance,
-      file->plugin_instance);
-  i->select.type = identifier_copy_part (cfg->select.type, file->type);
-  i->select.type_instance = identifier_copy_part (cfg->select.type_instance,
-      file->type_instance);
+  i->select = ident_copy_with_selector (cfg->select, file,
+      IDENT_FLAG_REPLACE_ANY);
+  if (i->select == NULL)
+  {
+    DEBUG ("instance_create: ident_copy_with_selector returned NULL.\n");
+    free (i);
+    return (NULL);
+  }
 
   i->files = NULL;
   i->files_num = 0;
@@ -259,26 +223,16 @@ static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */
 static int instance_add_file (graph_instance_t *inst, /* {{{ */
     const graph_ident_t *file)
 {
-  graph_ident_t *tmp;
+  graph_ident_t **tmp;
 
   tmp = realloc (inst->files, sizeof (*inst->files) * (inst->files_num + 1));
   if (tmp == NULL)
     return (ENOMEM);
   inst->files = tmp;
-  tmp = inst->files + inst->files_num;
 
-  memset (tmp, 0, sizeof (*tmp));
-  tmp->host = strdup (file->host);
-  tmp->plugin = strdup (file->plugin);
-  if (file->plugin_instance != NULL)
-    tmp->plugin_instance = strdup (file->plugin_instance);
-  else
-    tmp->plugin_instance = NULL;
-  tmp->type = strdup (file->type);
-  if (file->type_instance != NULL)
-    tmp->type_instance = strdup (file->type_instance);
-  else
-    tmp->type_instance = NULL;
+  inst->files[inst->files_num] = ident_clone (file);
+  if (inst->files[inst->files_num] == NULL)
+    return (ENOMEM);
 
   inst->files_num++;
 
@@ -294,7 +248,7 @@ static graph_instance_t *graph_find_instance (graph_config_t *cfg, /* {{{ */
     return (NULL);
 
   for (i = cfg->instances; i != NULL; i = i->next)
-    if (file_matches (&i->select, file))
+    if (ident_matches (i->select, file))
       return (i);
 
   return (NULL);
@@ -315,20 +269,24 @@ static int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{
   return (instance_add_file (inst, file));
 } /* }}} int graph_add_file */
 
-static int graph_append (graph_config_t *cfg) /* {{{ */
+static int graph_append (graph_config_t **head, /* {{{ */
+    graph_config_t *cfg)
 {
   graph_config_t *last;
 
   if (cfg == NULL)
     return (EINVAL);
 
-  if (graph_config_head == NULL)
+  if (head == NULL)
+    head = &graph_config_head;
+
+  if (*head == NULL)
   {
-    graph_config_head = cfg;
+    *head = cfg;
     return (0);
   }
 
-  last = graph_config_head;
+  last = *head;
   while (last->next != NULL)
     last = last->next;
 
@@ -337,30 +295,48 @@ static int graph_append (graph_config_t *cfg) /* {{{ */
   return (0);
 } /* }}} int graph_append */
 
-static int graph_create_from_file (const graph_ident_t *file) /* {{{ */
+static graph_config_t *graph_create (const graph_ident_t *selector) /* {{{ */
 {
   graph_config_t *cfg;
 
   cfg = malloc (sizeof (*cfg));
   if (cfg == NULL)
-    return (ENOMEM);
+    return (NULL);
   memset (cfg, 0, sizeof (*cfg));
 
-  cfg->select.host = strdup (file->host);
-  cfg->select.plugin = strdup (file->plugin);
-  cfg->select.plugin_instance = strdup (file->plugin_instance);
-  cfg->select.type = strdup (file->type);
-  cfg->select.type_instance = strdup (file->type_instance);
+  if (selector != NULL)
+    cfg->select = ident_clone (selector);
+  else
+    cfg->select = NULL;
 
   cfg->title = NULL;
   cfg->vertical_label = NULL;
+  cfg->defs = NULL;
   cfg->instances = NULL;
   cfg->next = NULL;
 
-  graph_append (cfg);
+  return (cfg);
+} /* }}} int graph_create */
+
+static void graph_destroy (graph_config_t *cfg) /* {{{ */
+{
+  graph_config_t *next;
+
+  if (cfg == NULL)
+    return;
+
+  next = cfg->next;
+
+  ident_destroy (cfg->select);
 
-  return (graph_add_file (cfg, file));
-} /* }}} int graph_create_from_file */
+  free (cfg->title);
+  free (cfg->vertical_label);
+
+  def_destroy (cfg->defs);
+  instance_destroy (cfg->instances);
+
+  graph_destroy (next);
+} /* }}} void graph_destroy */
 
 static int register_file (const graph_ident_t *file) /* {{{ */
 {
@@ -371,7 +347,7 @@ static int register_file (const graph_ident_t *file) /* {{{ */
   {
     int status;
 
-    if (!file_matches (&cfg->select, file))
+    if (!ident_matches (cfg->select, file))
       continue;
 
     status = graph_add_file (cfg, file);
@@ -386,197 +362,19 @@ 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 graph_ident_t *file) /* {{{ */
-{
-  graph_config_t *cfg;
-
-  cfg = malloc (sizeof (*cfg));
-  if (cfg == NULL)
-    return (ENOMEM);
-  memset (cfg, 0, sizeof (*cfg));
-
-  cfg->select.host = strdup (file->host);
-  cfg->select.plugin = strdup (file->plugin);
-  cfg->select.plugin_instance = strdup (file->plugin_instance);
-  cfg->select.type = strdup (file->type);
-  cfg->select.type_instance = strdup (file->type_instance);
-
-  cfg->title = NULL;
-  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);
-
-  graph_ident_t ident;
-
-
-  ident.host = ANY_TOKEN;
-  ident.plugin = "cpu";
-  ident.plugin_instance = ANY_TOKEN;
-  ident.type = "cpu";
-  ident.type_instance = ALL_TOKEN;
-  FIXME_graph_create_from_file (&ident);
-
-  ident.plugin = "memory";
-  ident.plugin_instance = "";
-  ident.type = "memory";
-  FIXME_graph_create_from_file (&ident);
-
-  ident.plugin = "swap";
-  ident.plugin_instance = "";
-  ident.type = "swap";
-  FIXME_graph_create_from_file (&ident);
-
-  ident.plugin = ANY_TOKEN;
-  ident.plugin_instance = ANY_TOKEN;
-  ident.type = "ps_state";
-  FIXME_graph_create_from_file (&ident);
-
-  ident.host = ALL_TOKEN;
-  ident.plugin = "cpu";
-  ident.plugin_instance = ALL_TOKEN;
-  ident.type = "cpu";
-  ident.type_instance = "idle";
-  FIXME_graph_create_from_file (&ident);
-
-  return (0);
-} /* }}} int read_graph_config */
-
-
-
-static int gl_compare (const void *p0, const void *p1) /* {{{ */
-{
-  const graph_ident_t *gl0 = p0;
-  const graph_ident_t *gl1 = p1;
-  int status;
-
-  status = strcmp (gl0->host, gl1->host);
-  if (status != 0)
-    return (status);
-
-  status = strcmp (gl0->plugin, gl1->plugin);
-  if (status != 0)
-    return (status);
-
-  status = strcmp_s (gl0->plugin_instance, gl1->plugin_instance);
-  if (status != 0)
-    return (status);
-
-  status = strcmp (gl0->type, gl1->type);
-  if (status != 0)
-    return (status);
-
-  return (strcmp_s (gl0->type_instance, gl1->type_instance));
-} /* }}} int gl_compare */
-
-static void gl_clear_entry (graph_ident_t *gl) /* {{{ */
-{
-  if (gl == NULL)
-    return;
-
-  free (gl->host);
-  free (gl->plugin);
-  free (gl->plugin_instance);
-  free (gl->type);
-  free (gl->type_instance);
-
-  gl->host = NULL;
-  gl->plugin = NULL;
-  gl->plugin_instance = NULL;
-  gl->type = NULL;
-  gl->type_instance = NULL;
-} /* }}} void gl_clear_entry */
-
-static void gl_clear (void) /* {{{ */
-{
-  size_t i;
-
-  for (i = 0; i < graph_list_length; i++)
-    gl_clear_entry (graph_list + i);
-
-  free (graph_list);
-  graph_list = NULL;
-  graph_list_length = 0;
-  gl_last_update = 0;
-} /* }}} void gl_clear */
-
-static int gl_add_copy (graph_ident_t *gl) /* {{{ */
-{
-  graph_ident_t *ptr;
-  int status;
-
-  if (gl == NULL)
-    return (EINVAL);
-
-  ptr = realloc (graph_list, sizeof (*graph_list) * (graph_list_length + 1));
-  if (ptr == NULL)
-    return (ENOMEM);
-  graph_list = ptr;
-
-  ptr = graph_list + graph_list_length;
-  memset (ptr, 0, sizeof (*ptr));
-  ptr->host = NULL;
-  ptr->plugin = NULL;
-  ptr->plugin_instance = NULL;
-  ptr->type = NULL;
-  ptr->type_instance = NULL;
-
-#define DUP_OR_BREAK(member) do {                    \
-  ptr->member = NULL;                                \
-  if (gl->member != NULL)                            \
-  {                                                  \
-    ptr->member = strdup (gl->member);               \
-    if (ptr->member == NULL)                         \
-      break;                                         \
-  }                                                  \
-} while (0)
-
-  status = ENOMEM;
-  do
   {
-    DUP_OR_BREAK(host);
-    DUP_OR_BREAK(plugin);
-    DUP_OR_BREAK(plugin_instance);
-    DUP_OR_BREAK(type);
-    DUP_OR_BREAK(type_instance);
-
-    status = 0;
-  } while (0);
-
-#undef DUP_OR_BREAK
-
-  if (status != 0)
-  {
-    free (ptr->host);
-    free (ptr->plugin);
-    free (ptr->plugin_instance);
-    free (ptr->type);
-    free (ptr->type_instance);
-    return (status);
+    cfg = graph_create (file);
+    graph_append (/* head = */ NULL, cfg);
+    graph_add_file (cfg, file);
   }
 
-  graph_list_length++;
   return (0);
-} /* }}} int gl_add_copy */
+} /* }}} int register_file */
 
 static int callback_type (const char *type, void *user_data) /* {{{ */
 {
-  graph_ident_t *gl;
+  gl_ident_stage_t *gl;
+  graph_ident_t *ident;
   int status;
 
   if ((type == NULL) || (user_data == NULL))
@@ -601,9 +399,18 @@ static int callback_type (const char *type, void *user_data) /* {{{ */
     gl->type_instance = gl->type + strlen (gl->type);
   }
 
-  register_file (gl);
-
-  status = gl_add_copy (gl);
+  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;
@@ -614,7 +421,7 @@ static int callback_type (const char *type, void *user_data) /* {{{ */
 
 static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
 {
-  graph_ident_t *gl;
+  gl_ident_stage_t *gl;
   int status;
 
   if ((plugin == NULL) || (user_data == NULL))
@@ -650,7 +457,7 @@ static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
 
 static int callback_host (const char *host, void *user_data) /* {{{ */
 {
-  graph_ident_t *gl;
+  gl_ident_stage_t *gl;
   int status;
 
   if ((host == NULL) || (user_data == NULL))
@@ -684,9 +491,215 @@ static const char *get_part_from_param (const char *prim_key, /* {{{ */
   return (param (sec_key));
 } /* }}} const char *get_part_from_param */
 
+/* Create one DEF for each data source in the file. Called by
+ * "gl_inst_get_default_defs" for each file. */
+static graph_def_t *gl_ident_get_default_defs (graph_config_t *cfg, /* {{{ */
+    graph_ident_t *ident, graph_def_t *def_head)
+{
+  graph_def_t *defs = NULL;
+  char *file;
+  char **dses = NULL;
+  size_t dses_num = 0;
+  int status;
+  size_t i;
+
+  if ((cfg == NULL) || (ident == NULL))
+    return (def_head);
+
+  file = ident_to_file (ident);
+  if (file == NULL)
+  {
+    DEBUG ("gl_ident_get_default_defs: ident_to_file returned NULL.\n");
+    return (def_head);
+  }
+
+  DEBUG ("gl_ident_get_default_defs: file = %s;\n", file);
+
+  status = ds_list_from_rrd_file (file, &dses_num, &dses);
+  if (status != 0)
+  {
+    free (file);
+    return (def_head);
+  }
+
+  for (i = 0; i < dses_num; i++)
+  {
+    graph_def_t *def;
+
+    def = def_search (def_head, ident, dses[i]);
+    if (def != NULL)
+      continue;
+
+    def = def_create (cfg, ident, dses[i]);
+    if (def == NULL)
+      continue;
+
+    if (defs == NULL)
+      defs = def;
+    else
+      def_append (defs, def);
+
+    free (dses[i]);
+  }
+
+  free (dses);
+  free (file);
+
+  return (defs);
+} /* }}} int gl_ident_get_default_defs */
+
+/* Create one or more DEFs for each file in the graph instance. The number
+ * depends on the number of data sources in each of the files. Called from
+ * "gl_instance_get_rrdargs" if no DEFs are available from the configuration.
+ * */
+static graph_def_t *gl_inst_get_default_defs (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst)
+{
+  graph_def_t *defs = NULL;
+  size_t i;
+
+  if ((cfg == NULL) || (inst == NULL))
+    return (NULL);
+
+  for (i = 0; i < inst->files_num; i++)
+  {
+    graph_def_t *def;
+
+    def = gl_ident_get_default_defs (cfg, inst->files[i], defs);
+    if (def == NULL)
+      continue;
+
+    if (defs == NULL)
+      defs = def;
+    else
+      def_append (defs, def);
+  }
+
+  return (defs);
+} /* }}} graph_def_t *gl_inst_get_default_defs */
+
+/* Called with each DEF in turn. Calls "def_get_rrdargs" with every appropriate
+ * file / DEF pair. */
+static int gl_instance_get_rrdargs_cb (graph_def_t *def, void *user_data) /* {{{ */
+{
+  def_callback_data_t *data = user_data;
+  graph_instance_t *inst = data->inst;
+  str_array_t *args = data->args;
+
+  size_t i;
+
+  for (i = 0; i < inst->files_num; i++)
+  {
+    if (!def_matches (def, inst->files[i]))
+      continue;
+
+    def_get_rrdargs (def, inst->files[i], args);
+  }
+
+  return (0);
+} /* }}} int gl_instance_get_rrdargs_cb */
+
+static int gl_clear_instances (void) /* {{{ */
+{
+  graph_config_t *cfg;
+
+  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  {
+    instance_destroy (cfg->instances);
+    cfg->instances = NULL;
+  }
+
+  return (0);
+} /* }}} int gl_clear_instances */
+
+
+/*
+ * Config functions
+ */
+static int config_get_string (const oconfig_item_t *ci, /* {{{ */
+    char **ret_str)
+{
+  char *tmp;
+
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
+    return (EINVAL);
+
+  tmp = strdup (ci->values[0].value.string);
+  if (tmp == NULL)
+    return (ENOMEM);
+
+  free (*ret_str);
+  *ret_str = tmp;
+
+  return (0);
+} /* }}} int config_get_string */
+
 /*
  * Global functions
  */
+int graph_config_add (const oconfig_item_t *ci) /* {{{ */
+{
+  char *host = NULL;
+  char *plugin = NULL;
+  char *plugin_instance = NULL;
+  char *type = NULL;
+  char *type_instance = NULL;
+  graph_config_t *cfg = NULL;
+  int i;
+
+  cfg = graph_create (/* selector = */ NULL);
+  if (cfg == NULL)
+    return (ENOMEM);
+
+  for (i = 0; i < ci->children_num; i++)
+  {
+    oconfig_item_t *child;
+
+    child = ci->children + i;
+
+    if (strcasecmp ("Host", child->key) == 0)
+      config_get_string (child, &host);
+    else if (strcasecmp ("Plugin", child->key) == 0)
+      config_get_string (child, &plugin);
+    else if (strcasecmp ("PluginInstance", child->key) == 0)
+      config_get_string (child, &plugin_instance);
+    else if (strcasecmp ("Type", child->key) == 0)
+      config_get_string (child, &type);
+    else if (strcasecmp ("TypeInstance", child->key) == 0)
+      config_get_string (child, &type_instance);
+    else if (strcasecmp ("Title", child->key) == 0)
+      config_get_string (child, &cfg->title);
+    else if (strcasecmp ("VerticalLabel", child->key) == 0)
+      config_get_string (child, &cfg->vertical_label);
+    /* TODO: DEFs! */
+  } /* for */
+
+  cfg->select = ident_create (host, plugin, plugin_instance,
+      type, type_instance);
+  if (cfg->select == NULL)
+  {
+    graph_destroy (cfg);
+    return (EINVAL);
+  }
+
+  graph_append (&graph_config_staging, cfg);
+
+  return (0);
+} /* }}} graph_config_add */
+
+int graph_config_submit (void) /* {{{ */
+{
+  graph_config_t *tmp;
+
+  tmp = graph_config_head;
+  graph_config_head = graph_config_staging;
+  graph_config_staging = NULL;
+
+  graph_destroy (tmp);
+
+  return (0);
+} /* }}} int graph_config_submit */
+
 int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
     char *buffer, size_t buffer_size)
 {
@@ -696,23 +709,25 @@ int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{
   buffer[0] = 0;
 
 #define COPY_FIELD(field) do {                                  \
-  if (strcmp (cfg->select.field, inst->select.field) == 0)      \
+  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->select.field, 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->select.field, 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->select.field, buffer_size);          \
+    strlcat (buffer, inst_f, buffer_size);                      \
   }                                                             \
 } while (0)
 
@@ -738,31 +753,39 @@ graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */
   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;
 
   if (cfg == NULL)
     cfg = graph_get_selected ();
 
   if (cfg == NULL)
+  {
+    DEBUG ("inst_get_selected: cfg == NULL;\n");
     return (NULL);
+  }
 
   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);
 
   for (inst = cfg->instances; inst != NULL; inst = inst->next)
   {
-    if ((strcmp (inst->select.host, host) != 0)
-        || (strcmp (inst->select.plugin, plugin) != 0)
-        || (strcmp (inst->select.plugin_instance, plugin_instance) != 0)
-        || (strcmp (inst->select.type, type) != 0)
-        || (strcmp (inst->select.type_instance, type_instance) != 0))
+    if (ident_compare (ident, inst->select) != 0)
       continue;
 
+    ident_destroy (ident);
     return (inst);
   }
 
+  DEBUG ("inst_get_selected: No match found.\n");
+  ident_destroy (ident);
   return (NULL);
 } /* }}} graph_instance_t *inst_get_selected */
 
@@ -774,6 +797,8 @@ int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
   if (callback == NULL)
     return (EINVAL);
 
+  gl_update ();
+
   for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
   {
     int status;
@@ -793,6 +818,7 @@ graph_config_t *graph_get_selected (void) /* {{{ */
   const char *plugin_instance = get_part_from_param ("graph_plugin_instance", "plugin_instance");
   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;
 
   if ((host == NULL)
@@ -800,18 +826,20 @@ graph_config_t *graph_get_selected (void) /* {{{ */
       || (type == NULL) || (type_instance == NULL))
     return (NULL);
 
+  ident = ident_create (host, plugin, plugin_instance, type, type_instance);
+
+  gl_update ();
+
   for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
   {
-    if ((strcmp (cfg->select.host, host) != 0)
-        || (strcmp (cfg->select.plugin, plugin) != 0)
-        || (strcmp (cfg->select.plugin_instance, plugin_instance) != 0)
-        || (strcmp (cfg->select.type, type) != 0)
-        || (strcmp (cfg->select.type_instance, type_instance) != 0))
+    if (ident_compare (ident, cfg->select) != 0)
       continue;
 
+    ident_destroy (ident);
     return (cfg);
   }
 
+  ident_destroy (ident);
   return (NULL);
 } /* }}} graph_config_t *graph_get_selected */
 
@@ -841,31 +869,33 @@ int gl_graph_get_title (graph_config_t *cfg, /* {{{ */
   if ((cfg == NULL) || (buffer == NULL) || (buffer_size < 1))
     return (EINVAL);
 
-  buffer[0] = 0;
-  strlcat (buffer, cfg->select.host, buffer_size);
-  strlcat (buffer, "/", buffer_size);
-  strlcat (buffer, cfg->select.plugin, buffer_size);
-  if (cfg->select.plugin_instance[0] != 0)
-  {
-    strlcat (buffer, "-", buffer_size);
-    strlcat (buffer, cfg->select.plugin_instance, buffer_size);
-  }
-  strlcat (buffer, "/", buffer_size);
-  strlcat (buffer, cfg->select.type, buffer_size);
-  if (cfg->select.type_instance[0] != 0)
-  {
-    strlcat (buffer, "-", buffer_size);
-    strlcat (buffer, cfg->select.type_instance, buffer_size);
-  }
+  if (cfg->title == NULL)
+    cfg->title = ident_to_string (cfg->select);
+
+  if (cfg->title == NULL)
+    return (ENOMEM);
+
+  strncpy (buffer, cfg->title, buffer_size);
+  buffer[buffer_size - 1] = 0;
 
   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 */
+
 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;
@@ -883,24 +913,73 @@ int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
   return (0);
 } /* }}} int gl_instance_get_all */
 
+int gl_instance_get_rrdargs (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst,
+    str_array_t *args)
+{
+  def_callback_data_t data = { inst, args };
+  graph_def_t *default_defs;
+  int status;
+
+  if ((cfg == NULL) || (inst == NULL) || (args == NULL))
+    return (EINVAL);
+
+  if (cfg->title != NULL)
+  {
+    array_append (args, "-t");
+    array_append (args, cfg->title);
+  }
+
+  if (cfg->vertical_label != NULL)
+  {
+    array_append (args, "-v");
+    array_append (args, cfg->vertical_label);
+  }
+
+  if (cfg->defs == NULL)
+  {
+    default_defs = gl_inst_get_default_defs (cfg, inst);
+
+    if (default_defs == NULL)
+      return (-1);
+
+    status = def_foreach (default_defs, gl_instance_get_rrdargs_cb, &data);
+
+    if (default_defs != NULL)
+      def_destroy (default_defs);
+  }
+  else
+  {
+    status = def_foreach (cfg->defs, gl_instance_get_rrdargs_cb, &data);
+  }
+
+  return (status);
+} /* }}} 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 */
+
 int gl_update (void) /* {{{ */
 {
   time_t now;
-  graph_ident_t gl;
+  gl_ident_stage_t gl;
   int status;
 
   /*
   printf ("Content-Type: text/plain\n\n");
   */
 
-  read_graph_config ();
-
   now = time (NULL);
 
   if ((gl_last_update + UPDATE_INTERVAL) >= now)
     return (0);
 
-  gl_clear ();
+  graph_read_config ();
 
   memset (&gl, 0, sizeof (gl));
   gl.host = NULL;
@@ -909,30 +988,12 @@ int gl_update (void) /* {{{ */
   gl.type = NULL;
   gl.type_instance = NULL;
 
+  gl_clear_instances ();
   status = foreach_host (callback_host, &gl);
 
-  /* print_graphs (); */
-
-  if (graph_list_length > 1)
-    qsort (graph_list, graph_list_length, sizeof (*graph_list), gl_compare);
+  gl_last_update = now;
 
   return (status);
 } /* }}} int gl_update */
 
-int gl_foreach (gl_callback callback, void *user_data) /* {{{ */
-{
-  size_t i;
-
-  for (i = 0; i < graph_list_length; i++)
-  {
-    int status;
-
-    status = (*callback) ((void *) (graph_list + i), user_data);
-    if (status != 0)
-      return (status);
-  }
-
-  return (0);
-} /* }}} int gl_foreach */
-
 /* vim: set sw=2 sts=2 et fdm=marker : */