graph_instance.[ch]: Move the graph_instance_t code into an own module.

diff --git a/Makefile b/Makefile
index 130a98aeddc757c91c07f259b745a052f9bcf9e1..65544e67465f0893b51a552c6774ce1cc3780ee7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,11 @@ common.o: common.c common.h
 
 graph_config.o: graph_config.c graph_config.h
 
+graph_def.o: graph_def.c graph_def.h
+
 graph_ident.o: graph_ident.c graph_ident.h
 
-graph_def.o: graph_def.c graph_def.h
+graph_instance.o: graph_instance.c graph_instance.h
 
 graph_list.o: graph_list.c graph_list.h
 
@@ -42,7 +44,7 @@ parser.o: parser.c
 test: test.c utils_params.o
 
 test.fcgi: LDLIBS = -lfcgi -lrrd
-test.fcgi: test.fcgi.c common.o graph_config.o graph_ident.o graph_def.o graph_list.o utils_array.o utils_params.o action_graph.o action_list_graphs.o scanner.o parser.o oconfig.o
+test.fcgi: test.fcgi.c common.o graph_config.o graph_def.o graph_ident.o graph_instance.o graph_list.o utils_array.o utils_params.o action_graph.o action_list_graphs.o scanner.o parser.o oconfig.o
 
 .PHONY: clean
 

diff --git a/action_graph.c b/action_graph.c
index 5771e17676394f07e9d5b1d71ac8fa030e16201f..b565182d835196fca72747f296228a03e902eec4 100644 (file)
--- a/action_graph.c
+++ b/action_graph.c
@@ -19,22 +19,6 @@
 #include <fcgiapp.h>
 #include <fcgi_stdio.h>
 
-struct data_source_s
-{
-};
-typedef struct data_source_s data_source_t;
-
-struct graph_def_s
-{
-  data_source_t *data_sources;
-  size_t data_sources_num;
-
-  _Bool stack;
-
-  int def_num;
-};
-typedef struct graph_def_s graph_def_t;
-
 static void emulate_graph (int argc, char **argv) /* {{{ */
 {
   int i;
@@ -120,11 +104,11 @@ int action_graph (void) /* {{{ */
   array_append (args, "--imgformat");
   array_append (args, "PNG");
 
-  status = gl_instance_get_rrdargs (cfg, inst, args);
+  status = inst_get_rrdargs (cfg, inst, args);
   if (status != 0)
   {
     array_destroy (args);
-    OUTPUT_ERROR ("gl_instance_get_rrdargs failed with status %i.\n", status);
+    OUTPUT_ERROR ("inst_get_rrdargs failed with status %i.\n", status);
   }
 
   rrd_clear_error ();

diff --git a/action_list_graphs.c b/action_list_graphs.c
index 0663b98dbbcfd6f1aad2bd06fc8cf423a0e31e77..fc4ec14e31501227277f76da8be362300ec7e9a3 100644 (file)
--- a/action_list_graphs.c
+++ b/action_list_graphs.c
@@ -20,7 +20,7 @@ static int print_graph_inst_json (__attribute__((unused)) graph_config_t *cfg, /
 
   first = user_data;
 
-  ident = gl_instance_get_selector (inst);
+  ident = inst_get_selector (inst);
   if (ident == NULL)
     return (-1);
 
@@ -68,7 +68,7 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
   char buffer[1024];
 
   memset (buffer, 0, sizeof (buffer));
-  gl_instance_get_params (cfg, inst, buffer, sizeof (buffer));
+  inst_get_params (cfg, inst, buffer, sizeof (buffer));
 
   printf ("<li><a href=\"test.fcgi?action=graph;%s\">%s</a></li>\n", buffer, buffer);
 

diff --git a/graph_instance.c b/graph_instance.c
new file mode 100644 (file)
index 0000000..fa4716d
--- /dev/null
+++ b/graph_instance.c
@@ -0,0 +1,442 @@
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "graph_instance.h"
+#include "graph_ident.h"
+#include "common.h"
+#include "utils_params.h"
+
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
+
+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 def_callback_data_s
+{
+  graph_instance_t *inst;
+  str_array_t *args;
+};
+typedef struct def_callback_data_s def_callback_data_t;
+
+/*
+ * Private functions
+ */
+/* Create one DEF for each data source in the file. Called by
+ * "inst_get_default_defs" for each file. */
+static graph_def_t *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)
+  {
+    fprintf (stderr, "ident_get_default_defs: ident_to_file failed\n");
+    return (def_head);
+  }
+
+  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 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
+ * "inst_get_rrdargs" if no DEFs are available from the configuration.
+ * */
+static graph_def_t *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 = 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 *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 const char *get_part_from_param (const char *prim_key, /* {{{ */
+    const char *sec_key)
+{
+  const char *val;
+
+  val = param (prim_key);
+  if (val != NULL)
+    return (val);
+  
+  return (param (sec_key));
+} /* }}} const char *get_part_from_param */
+
+/*
+ * Public functions
+ */
+graph_instance_t *inst_create (graph_config_t *cfg, /* {{{ */
+    const graph_ident_t *ident)
+{
+  graph_instance_t *i;
+  graph_ident_t *selector;
+
+  if ((cfg == NULL) || (ident == NULL))
+    return (NULL);
+
+  i = malloc (sizeof (*i));
+  if (i == NULL)
+    return (NULL);
+  memset (i, 0, sizeof (*i));
+
+  selector = gl_graph_get_selector (cfg);
+  if (selector == NULL)
+  {
+    fprintf (stderr, "inst_create: gl_graph_get_selector failed\n");
+    free (i);
+    return (NULL);
+  }
+
+  i->select = ident_copy_with_selector (selector, ident,
+      IDENT_FLAG_REPLACE_ANY);
+  if (i->select == NULL)
+  {
+    fprintf (stderr, "inst_create: ident_copy_with_selector failed\n");
+    ident_destroy (selector);
+    free (i);
+    return (NULL);
+  }
+
+  ident_destroy (selector);
+
+  i->files = NULL;
+  i->files_num = 0;
+
+  i->next = NULL;
+
+  return (i);
+} /* }}} graph_instance_t *inst_create */
+
+void inst_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);
+
+  inst_destroy (next);
+} /* }}} void inst_destroy */
+
+int inst_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;
+
+  inst->files[inst->files_num] = ident_clone (file);
+  if (inst->files[inst->files_num] == NULL)
+    return (ENOMEM);
+
+  inst->files_num++;
+
+  return (0);
+} /* }}} int inst_add_file */
+
+graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */
+{
+  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;
+
+  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 = gl_graph_get_instances (cfg); inst != NULL; inst = inst->next)
+  {
+    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 */
+
+int inst_get_rrdargs (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst,
+    str_array_t *args)
+{
+  def_callback_data_t data = { inst, args };
+  graph_def_t *defs;
+  int status;
+
+  if ((cfg == NULL) || (inst == NULL) || (args == NULL))
+    return (EINVAL);
+
+/* FIXME: Re-enable title and vertical label stuff. */
+#if 0
+  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);
+  }
+#endif
+
+  defs = gl_graph_get_defs (cfg);
+  if (defs == NULL)
+  {
+    defs = inst_get_default_defs (cfg, inst);
+
+    if (defs == NULL)
+      return (-1);
+
+    status = def_foreach (defs, gl_instance_get_rrdargs_cb, &data);
+
+    def_destroy (defs);
+  }
+  else
+  {
+    status = def_foreach (defs, gl_instance_get_rrdargs_cb, &data);
+  }
+
+  return (status);
+} /* }}} int inst_get_rrdargs */
+
+graph_ident_t *inst_get_selector (graph_instance_t *inst) /* {{{ */
+{
+  if (inst == NULL)
+    return (NULL);
+
+  return (ident_clone (inst->select));
+} /* }}} graph_ident_t *inst_get_selector */
+
+int inst_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
+    char *buffer, size_t buffer_size)
+{
+  graph_ident_t *cfg_select;
+
+  if ((cfg == NULL) || (inst == NULL)
+      || (buffer == NULL) || (buffer_size < 1))
+    return (EINVAL);
+
+  cfg_select = gl_graph_get_selector (cfg);
+  if (cfg_select == NULL)
+  {
+    fprintf (stderr, "inst_get_params: gl_graph_get_selector failed");
+    return (-1);
+  }
+
+  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
+
+  ident_destroy (cfg_select);
+
+  return (0);
+} /* }}} int inst_get_params */
+
+int inst_append (graph_instance_t *head, graph_instance_t *inst) /* {{{ */
+{
+  graph_instance_t *ptr;
+
+  if ((head == NULL) || (inst == NULL))
+    return (EINVAL);
+
+  ptr = head;
+  while (ptr->next != NULL)
+    ptr = ptr->next;
+
+  ptr->next = inst;
+
+  return (0);
+} /* }}} int inst_append */
+
+int inst_foreach (graph_instance_t *inst, /* {{{ */
+               inst_callback cb, void *user_data)
+{
+  graph_instance_t *ptr;
+
+  if ((inst == NULL) || (cb == NULL))
+    return (EINVAL);
+
+  for (ptr = inst; ptr != NULL; ptr = ptr->next)
+  {
+    int status;
+
+    status = (*cb) (ptr, user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int inst_foreach */
+
+graph_instance_t *inst_find_matching (graph_instance_t *inst, /* {{{ */
+    const graph_ident_t *ident)
+{
+  graph_instance_t *ptr;
+
+  if ((inst == NULL) || (ident == NULL))
+    return (NULL);
+
+  for (ptr = inst; ptr != NULL; ptr = ptr->next)
+    if (ident_matches (ptr->select, ident))
+      return (ptr);
+
+  return (NULL);
+} /* }}} graph_instance_t *inst_find_matching */
+
+/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/graph_instance.h b/graph_instance.h
new file mode 100644 (file)
index 0000000..f167d23
--- /dev/null
+++ b/graph_instance.h
@@ -0,0 +1,46 @@
+#ifndef GRAPH_INSTANCE_H
+#define GRAPH_INSTANCE_H 1
+
+/*
+ * Data types
+ */
+struct graph_instance_s;
+typedef struct graph_instance_s graph_instance_t;
+
+typedef int (*inst_callback) (graph_instance_t *inst, void *user_data);
+
+#include "graph_list.h"
+
+/*
+ * Callback types
+ */
+/*
+ * Methods
+ */
+graph_instance_t *inst_create (graph_config_t *cfg,
+               const graph_ident_t *ident);
+
+void inst_destroy (graph_instance_t *inst);
+
+int inst_add_file (graph_instance_t *inst, const graph_ident_t *file);
+
+graph_instance_t *inst_get_selected (graph_config_t *cfg);
+
+int inst_get_params (graph_config_t *cfg, graph_instance_t *inst,
+    char *buffer, size_t buffer_size);
+
+int inst_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
+    str_array_t *args);
+
+graph_ident_t *inst_get_selector (graph_instance_t *inst);
+
+int inst_append (graph_instance_t *head, graph_instance_t *inst);
+
+int inst_foreach (graph_instance_t *inst,
+               inst_callback cb, void *user_data);
+
+graph_instance_t *inst_find_matching (graph_instance_t *inst,
+    const graph_ident_t *ident);
+
+#endif /* GRAPH_INSTANCE_H */
+/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/graph_list.c b/graph_list.c
index eff134f350edac10e6f7bc5ba1f532bf713e0334..5b37f2d33162075ebf0a15778cd759204a6f3ec8 100644 (file)
--- a/graph_list.c
+++ b/graph_list.c
@@ -38,16 +38,6 @@ struct gl_ident_stage_s /* {{{ */
 }; /* }}} */
 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_config_s /* {{{ */
 {
   graph_ident_t *select;
@@ -62,13 +52,6 @@ struct graph_config_s /* {{{ */
   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
  */
@@ -80,61 +63,6 @@ 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) /* {{{ */
@@ -151,107 +79,19 @@ static int strcmp_s (const char *s1, const char *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);
-
-  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 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,
-      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;
-
-  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;
-
-  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)
+    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 (ident_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) /* {{{ */
@@ -261,12 +101,17 @@ 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 **head, /* {{{ */
@@ -333,7 +178,7 @@ static void graph_destroy (graph_config_t *cfg) /* {{{ */
   free (cfg->vertical_label);
 
   def_destroy (cfg->defs);
-  instance_destroy (cfg->instances);
+  inst_destroy (cfg->instances);
 
   graph_destroy (next);
 } /* }}} void graph_destroy */
@@ -491,121 +336,13 @@ 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);
+    inst_destroy (cfg->instances);
     cfg->instances = NULL;
   }
 
@@ -659,7 +396,6 @@ static graph_ident_t *graph_config_get_selector (const oconfig_item_t *ci) /* {{
 /*
  * Global functions
  */
-
 int graph_config_add (const oconfig_item_t *ci) /* {{{ */
 {
   graph_ident_t *select;
@@ -708,95 +444,6 @@ int graph_config_submit (void) /* {{{ */
   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)
-{
-  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 (0);
-} /* }}} int gl_instance_get_params */
-
-graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */
-{
-  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;
-
-  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 (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 */
-
 int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
     void *user_data)
 {
@@ -851,25 +498,57 @@ graph_config_t *graph_get_selected (void) /* {{{ */
   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)
@@ -897,95 +576,35 @@ graph_ident_t *gl_graph_get_selector (graph_config_t *cfg) /* {{{ */
   return (ident_clone (cfg->select));
 } /* }}} graph_ident_t *gl_graph_get_selector */
 
-int gl_graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */
+graph_instance_t *gl_graph_get_instances (graph_config_t *cfg) /* {{{ */
 {
-  if ((cfg == NULL) || (def == NULL))
-    return (EINVAL);
-
-  if (cfg->defs == NULL)
-  {
-    cfg->defs = def;
-    return (0);
-  }
-
-  return (def_append (cfg->defs, def));
-} /* }}} int gl_graph_add_def */
+  if (cfg == NULL)
+    return (NULL);
 
+  return (cfg->instances);
+} /* }}} graph_instance_t *gl_graph_get_instances */
 
-int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
-    void *user_data)
+graph_def_t *gl_graph_get_defs (graph_config_t *cfg) /* {{{ */
 {
-  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);
-    }
-  }
+  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) /* {{{ */
 {
-  def_callback_data_t data = { inst, args };
-  graph_def_t *default_defs;
-  int status;
-
-  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);
-  }
-
-  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);
+    cfg->defs = def;
+    return (0);
   }
 
-  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 */
+  return (def_append (cfg->defs, def));
+} /* }}} int gl_graph_add_def */
 
 int gl_update (void) /* {{{ */
 {

diff --git a/graph_list.h b/graph_list.h
index 89351a981723cb6c266248ea59c49f3a500e2af2..f03122ac59f80078f9cff0c517b2fb857b605d3e 100644 (file)
--- a/graph_list.h
+++ b/graph_list.h
@@ -4,12 +4,15 @@
 /*
  * Data types
  */
-struct graph_instance_s;
-typedef struct graph_instance_s graph_instance_t;
-
 struct graph_config_s;
 typedef struct graph_config_s graph_config_t;
 
+#include "graph_def.h"
+#include "graph_ident.h"
+#include "graph_instance.h"
+#include "utils_array.h"
+#include "oconfig.h"
+
 /*
  * Callback types
  */
@@ -19,11 +22,6 @@ typedef int (*gl_cfg_callback) (graph_config_t *cfg,
 typedef int (*gl_inst_callback) (graph_config_t *cfg,
     graph_instance_t *inst, void *user_data);
 
-#include "graph_def.h"
-#include "graph_ident.h"
-#include "utils_array.h"
-#include "oconfig.h"
-
 /*
  * Functions
  */
@@ -40,24 +38,18 @@ int gl_graph_get_title (graph_config_t *cfg,
 
 graph_ident_t *gl_graph_get_selector (graph_config_t *cfg);
 
+graph_instance_t *gl_graph_get_instances (graph_config_t *cfg);
+
+graph_def_t *gl_graph_get_defs (graph_config_t *cfg);
+
 int gl_graph_add_def (graph_config_t *cfg, graph_def_t *def);
 
 int gl_graph_instance_get_all (graph_config_t *cfg,
     gl_inst_callback callback, void *user_data);
 
-graph_instance_t *inst_get_selected (graph_config_t *cfg);
-
 int gl_instance_get_all (gl_inst_callback callback,
     void *user_data);
 
-int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst,
-    char *buffer, size_t buffer_size);
-
-int gl_instance_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
-    str_array_t *args);
-
-graph_ident_t *gl_instance_get_selector (graph_instance_t *inst);
-
 int gl_update (void);
 
 #endif /* GRAPH_LIST_H */