X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=graph_list.c;h=5b37f2d33162075ebf0a15778cd759204a6f3ec8;hb=816c38cf8560599b827df4edc01227c4348162c3;hp=3b634f5848488f4322be617cae2063a7491d2839;hpb=b2db68ebb7acdb345c07985fcdb35dcfbb36d4aa;p=collection4.git

diff --git a/graph_list.c b/graph_list.c
index 3b634f5..5b37f2d 100644
--- a/graph_list.c
+++ b/graph_list.c
@@ -6,9 +6,11 @@
 #include <time.h>
 #include <errno.h>
 #include <assert.h>
-#include <limits.h> /* PATH_MAX */
 
 #include "graph_list.h"
+#include "graph_ident.h"
+#include "graph_def.h"
+#include "graph_config.h"
 #include "common.h"
 #include "utils_params.h"
 
@@ -23,44 +25,28 @@
 #define ANY_TOKEN "/any/"
 #define ALL_TOKEN "/all/"
 
-#if 0
-# define GL_DEBUG(...) do {             \
-  printf ("Content-Type: text/plain\n\n"); \
-  printf (__VA_ARGS__);                    \
-} while (0)
-#else
-# define GL_DEBUG(...) /**/
-#endif
-
 /*
  * 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 */
-
-struct graph_instance_s /* {{{ */
-{
-  graph_ident_t select;
-
-  graph_ident_t *files;
-  size_t files_num;
-
-  graph_instance_t *next;
-}; /* }}} struct graph_instance_s */
+}; /* }}} */
+typedef struct gl_ident_stage_s gl_ident_stage_t;
 
 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;
@@ -70,67 +56,14 @@ struct graph_config_s /* {{{ */
  * 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;
 
 /*
  * 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 *file = inst->files + i;
-
-    printf ("    File \"%s/%s-%s/%s-%s\"\n",
-        file->host,
-        file->plugin, file->plugin_instance,
-        file->type, file->type_instance);
-  }
-
-  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)
-  {
-    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);
-
-    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)
-  {
-    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);
-
-    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) /* {{{ */
 {
@@ -144,231 +77,21 @@ static int strcmp_s (const char *s1, const char *s2) /* {{{ */
 
   return (strcmp (s1, s2));
 } /* }}} int strcmp_s */
-
-static _Bool part_matches (const char *sel, const char *val) /* {{{ */
-{
-  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);
-
-  if (!part_matches (sel->host, val->host))
-    return (0);
-
-  if (!part_matches (sel->plugin, val->plugin))
-    return (0);
-
-  if (!part_matches (sel->plugin_instance, val->plugin_instance))
-    return (0);
-
-  if (!part_matches (sel->type, val->type))
-    return (0);
-
-  if (!part_matches (sel->type_instance, val->type_instance))
-    return (0);
-
-  return (1);
-} /* }}} _Bool ident_compare */
-
-/* Free all the pointers contained in the graph_ident_t but don't free the
- * graph_ident_t* itself. */
-static void ident_destroy (graph_ident_t *ident) /* {{{ */
-{
-  if (ident == NULL)
-    return;
-
-  free (ident->host);
-  ident->host = NULL;
-  free (ident->plugin);
-  ident->plugin = NULL;
-  free (ident->plugin_instance);
-  ident->plugin_instance = NULL;
-  free (ident->type);
-  ident->type = NULL;
-  free (ident->type_instance);
-  ident->type_instance = NULL;
-} /* }}} void ident_destroy */
-
-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);
-
-  instance_destroy (next);
-} /* }}} void instance_destroy */
-
-static void graph_destroy (graph_config_t *cfg) /* {{{ */
-{
-  graph_config_t *next;
-
-  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 */
+#endif
 
 /*
  * 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)
-{
-  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.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->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;
-
-  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_num++;
-
-  return (0);
-} /* }}} int instance_add_file */
 
 static graph_instance_t *graph_find_instance (graph_config_t *cfg, /* {{{ */
-    const graph_ident_t *file)
+    const graph_ident_t *ident)
 {
-  graph_instance_t *i;
-
-  if ((cfg == NULL) || (file == NULL))
+  if ((cfg == NULL) || (ident == NULL))
     return (NULL);
 
-  for (i = cfg->instances; i != NULL; i = i->next)
-    if (file_matches (&i->select, file))
-      return (i);
-
-  return (NULL);
+  return (inst_find_matching (cfg->instances, ident));
 } /* }}} graph_instance_t *graph_find_instance */
 
 static int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
@@ -378,28 +101,37 @@ static int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{
   inst = graph_find_instance (cfg, file);
   if (inst == NULL)
   {
-    inst = instance_create (cfg, file);
+    inst = inst_create (cfg, file);
     if (inst == NULL)
       return (ENOMEM);
+
+    if (cfg->instances == NULL)
+      cfg->instances = inst;
+    else
+      inst_append (cfg->instances, inst);
   }
 
-  return (instance_add_file (inst, file));
+  return (inst_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;
 
@@ -408,30 +140,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);
+  inst_destroy (cfg->instances);
+
+  graph_destroy (next);
+} /* }}} void graph_destroy */
 
 static int register_file (const graph_ident_t *file) /* {{{ */
 {
@@ -442,7 +192,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);
@@ -457,203 +207,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, /* {{{ */
-    const char *title)
-{
-  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;
-  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);
-
-  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, "CPU {instance} usage");
-
-  ident.plugin = "memory";
-  ident.plugin_instance = "";
-  ident.type = "memory";
-  FIXME_graph_create_from_file (&ident, "Memory usage");
-
-  ident.plugin = "swap";
-  ident.plugin_instance = "";
-  ident.type = "swap";
-  FIXME_graph_create_from_file (&ident, "Swap");
-
-  ident.plugin = ANY_TOKEN;
-  ident.plugin_instance = ANY_TOKEN;
-  ident.type = "ps_state";
-  FIXME_graph_create_from_file (&ident, "Processes");
-
-  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, "CPU idle overview");
-
-  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;
-  graph_config_t *cfg;
-
-  cfg = graph_config_head;
-  graph_config_head = NULL;
-  graph_destroy (cfg);
-
-  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))
@@ -678,9 +244,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;
@@ -691,7 +266,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))
@@ -727,7 +302,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))
@@ -761,196 +336,113 @@ 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)
-  {
-    GL_DEBUG ("gl_ident_get_rrdargs: ident_to_file returned NULL.\n");
-    return (-1);
-  }
-
-  GL_DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file);
+  graph_config_t *cfg;
 
-  status = ds_list_from_rrd_file (file, &dses_num, &dses);
-  if (status != 0)
+  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
   {
-    free (file);
-    return (status);
+    inst_destroy (cfg->instances);
+    cfg->instances = NULL;
   }
 
-  for (i = 0; i < dses_num; i++)
-  {
-    int index;
-
-    GL_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);
+  return (0);
+} /* }}} int gl_clear_instances */
 
-  free (file);
 
-  return (0);
-} /* }}} int gl_ident_get_rrdargs */
+/*
+ * Config functions
+ */
+static graph_ident_t *graph_config_get_selector (const oconfig_item_t *ci) /* {{{ */
+{
+  char *host = NULL;
+  char *plugin = NULL;
+  char *plugin_instance = NULL;
+  char *type = NULL;
+  char *type_instance = NULL;
+  graph_ident_t *ret;
+  int i;
+
+  for (i = 0; i < ci->children_num; i++)
+  {
+    oconfig_item_t *child;
+
+    child = ci->children + i;
+
+    if (strcasecmp ("Host", child->key) == 0)
+      graph_config_get_string (child, &host);
+    else if (strcasecmp ("Plugin", child->key) == 0)
+      graph_config_get_string (child, &plugin);
+    else if (strcasecmp ("PluginInstance", child->key) == 0)
+      graph_config_get_string (child, &plugin_instance);
+    else if (strcasecmp ("Type", child->key) == 0)
+      graph_config_get_string (child, &type);
+    else if (strcasecmp ("TypeInstance", child->key) == 0)
+      graph_config_get_string (child, &type_instance);
+    /* else: ignore all other directives here. */
+  } /* for */
+
+  ret = ident_create (host, plugin, plugin_instance, type, type_instance);
+
+  free (host);
+  free (plugin);
+  free (plugin_instance);
+  free (type);
+  free (type_instance);
+
+  return (ret);
+} /* }}} int graph_config_get_selector */
 
 /*
  * Global functions
  */
-char *ident_to_file (const graph_ident_t *ident) /* {{{ */
+int graph_config_add (const oconfig_item_t *ci) /* {{{ */
 {
-  char buffer[PATH_MAX];
+  graph_ident_t *select;
+  graph_config_t *cfg = NULL;
+  int i;
 
-  buffer[0] = 0;
+  select = graph_config_get_selector (ci);
+  if (select == NULL)
+    return (EINVAL);
 
-  strlcat (buffer, DATA_DIR, sizeof (buffer));
-  strlcat (buffer, "/", sizeof (buffer));
+  cfg = graph_create (/* selector = */ NULL);
+  if (cfg == NULL)
+    return (ENOMEM);
 
-  strlcat (buffer, ident->host, sizeof (buffer));
-  strlcat (buffer, "/", sizeof (buffer));
-  strlcat (buffer, ident->plugin, sizeof (buffer));
-  if (ident->plugin_instance[0] != 0)
-  {
-    strlcat (buffer, "-", sizeof (buffer));
-    strlcat (buffer, ident->plugin_instance, sizeof (buffer));
-  }
-  strlcat (buffer, "/", sizeof (buffer));
-  strlcat (buffer, ident->type, sizeof (buffer));
-  if (ident->type_instance[0] != 0)
-  {
-    strlcat (buffer, "-", sizeof (buffer));
-    strlcat (buffer, ident->type_instance, sizeof (buffer));
-  }
+  cfg->select = select;
 
-  strlcat (buffer, ".rrd", sizeof (buffer));
+  for (i = 0; i < ci->children_num; i++)
+  {
+    oconfig_item_t *child;
 
-  return (strdup (buffer));
-} /* }}} char *ident_to_file */
+    child = ci->children + i;
 
-int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
-    char *buffer, size_t buffer_size)
-{
-  if ((inst == NULL) || (buffer == NULL) || (buffer_size < 1))
-    return (EINVAL);
+    if (strcasecmp ("Title", child->key) == 0)
+      graph_config_get_string (child, &cfg->title);
+    else if (strcasecmp ("VerticalLabel", child->key) == 0)
+      graph_config_get_string (child, &cfg->vertical_label);
+    else if (strcasecmp ("DEF", child->key) == 0)
+      def_config (cfg, child);
+  } /* for */
 
-  buffer[0] = 0;
-
-#define COPY_FIELD(field) do {                                  \
-  if (strcmp (cfg->select.field, inst->select.field) == 0)      \
-  {                                                             \
-    strlcat (buffer, #field, buffer_size);                      \
-    strlcat (buffer, "=", buffer_size);                         \
-    strlcat (buffer, cfg->select.field, 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, ";", buffer_size);                         \
-    strlcat (buffer, "inst_", buffer_size);                     \
-    strlcat (buffer, #field, buffer_size);                      \
-    strlcat (buffer, "=", buffer_size);                         \
-    strlcat (buffer, inst->select.field, 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
+  graph_append (&graph_config_staging, cfg);
 
   return (0);
-} /* }}} int gl_instance_get_params */
+} /* }}} graph_config_add */
 
-graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */
+int graph_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_instance_t *inst;
+  graph_config_t *tmp;
 
-  if (cfg == NULL)
-    cfg = graph_get_selected ();
+  tmp = graph_config_head;
+  graph_config_head = graph_config_staging;
+  graph_config_staging = NULL;
 
-  if (cfg == NULL)
-  {
-    GL_DEBUG ("inst_get_selected: cfg == NULL;\n");
-    return (NULL);
-  }
+  graph_destroy (tmp);
 
-  if ((host == NULL)
-      || (plugin == NULL) || (plugin_instance == NULL)
-      || (type == NULL) || (type_instance == NULL))
-  {
-    GL_DEBUG ("inst_get_selected: A parameter is NULL.\n");
-    return (NULL);
-  }
-
-  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))
-      continue;
-
-    return (inst);
-  }
-
-  GL_DEBUG ("inst_get_selected: No match found.\n");
-  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)
@@ -981,56 +473,82 @@ 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)
       || (plugin == NULL) || (plugin_instance == NULL)
       || (type == NULL) || (type_instance == NULL))
-  {
-    printf ("Content-Type: text/plain\n\n");
-    printf ("graph_get_selected(): A param is NULL.\n");
     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);
   }
 
-  printf ("Content-Type: text/plain\n\n");
-  printf ("graph_get_selected(): No matching graph found.\n");
-
+  ident_destroy (ident);
   return (NULL);
 } /* }}} graph_config_t *graph_get_selected */
 
+/* gl_instance_get_all, gl_graph_instance_get_all {{{ */
+struct gl_inst_callback_data /* {{{ */
+{
+  graph_config_t *cfg;
+  gl_inst_callback callback;
+  void *user_data;
+}; /* }}} struct gl_inst_callback_data */
+
+static int gl_inst_callback_handler (graph_instance_t *inst, /* {{{ */
+    void *user_data)
+{
+  struct gl_inst_callback_data *data = user_data;
+
+  return ((*data->callback) (data->cfg, inst, data->user_data));
+} /* }}} int gl_inst_callback_handler */
+
 int gl_graph_instance_get_all (graph_config_t *cfg, /* {{{ */
     gl_inst_callback callback, void *user_data)
 {
-  graph_instance_t *inst;
+  struct gl_inst_callback_data data =
+  {
+    cfg,
+    callback,
+    user_data
+  };
 
   if ((cfg == NULL) || (callback == NULL))
     return (EINVAL);
 
-  for (inst = cfg->instances; inst != NULL; inst = inst->next)
+  return (inst_foreach (cfg->instances, 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)
   {
     int status;
 
-    status = (*callback) (cfg, inst, user_data);
+    status = gl_graph_instance_get_all (cfg, callback, user_data);
     if (status != 0)
       return (status);
   }
 
   return (0);
-} /* }}} int gl_graph_instance_get_all */
+} /* }}} int gl_instance_get_all */
+/* }}} gl_instance_get_all, gl_graph_instance_get_all */
 
 int gl_graph_get_title (graph_config_t *cfg, /* {{{ */
     char *buffer, size_t buffer_size)
@@ -1038,83 +556,60 @@ 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 */
 
-int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
-    void *user_data)
+graph_ident_t *gl_graph_get_selector (graph_config_t *cfg) /* {{{ */
 {
-  graph_config_t *cfg;
+  if (cfg == NULL)
+    return (NULL);
 
-  gl_update ();
+  return (ident_clone (cfg->select));
+} /* }}} graph_ident_t *gl_graph_get_selector */
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
-  {
-    graph_instance_t *inst;
+graph_instance_t *gl_graph_get_instances (graph_config_t *cfg) /* {{{ */
+{
+  if (cfg == NULL)
+    return (NULL);
 
-    for (inst = cfg->instances; inst != NULL; inst = inst->next)
-    {
-      int status;
+  return (cfg->instances);
+} /* }}} graph_instance_t *gl_graph_get_instances */
 
-      status = (*callback) (cfg, inst, user_data);
-      if (status != 0)
-        return (status);
-    }
-  }
+graph_def_t *gl_graph_get_defs (graph_config_t *cfg) /* {{{ */
+{
+  if (cfg == NULL)
+    return (NULL);
 
-  return (0);
-} /* }}} int gl_instance_get_all */
+  return (cfg->defs);
+} /* }}} graph_def_t *gl_graph_get_defs */
 
-int gl_instance_get_rrdargs (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst,
-    str_array_t *args)
+int gl_graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */
 {
-  size_t i;
-
-  if ((cfg == NULL) || (inst == NULL) || (args == NULL))
+  if ((cfg == NULL) || (def == NULL))
     return (EINVAL);
 
-  if (cfg->title != NULL)
-  {
-    array_append (args, "-t");
-    array_append (args, cfg->title);
-  }
-
-  for (i = 0; i < inst->files_num; i++)
+  if (cfg->defs == NULL)
   {
-    int status;
-
-    status = gl_ident_get_rrdargs (cfg, inst, inst->files + i, args);
-    if (status != 0)
-      return (status);
+    cfg->defs = def;
+    return (0);
   }
 
-  return (0);
-} /* }}} int gl_instance_get_rrdargs */
-
-/* DELETEME */
+  return (def_append (cfg->defs, def));
+} /* }}} int gl_graph_add_def */
 
 int gl_update (void) /* {{{ */
 {
   time_t now;
-  graph_ident_t gl;
+  gl_ident_stage_t gl;
   int status;
 
   /*
@@ -1126,9 +621,7 @@ int gl_update (void) /* {{{ */
   if ((gl_last_update + UPDATE_INTERVAL) >= now)
     return (0);
 
-  gl_clear ();
-
-  read_graph_config ();
+  graph_read_config ();
 
   memset (&gl, 0, sizeof (gl));
   gl.host = NULL;
@@ -1137,30 +630,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 : */