X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=graph_list.c;h=965fcbac4f6caad5913b9a0097dd2937ec773ffb;hb=3dfc071fbc2e15897d1888e7d75c444a7a801189;hp=5b37f2d33162075ebf0a15778cd759204a6f3ec8;hpb=816c38cf8560599b827df4edc01227c4348162c3;p=collection4.git

diff --git a/graph_list.c b/graph_list.c
index 5b37f2d..965fcba 100644
--- a/graph_list.c
+++ b/graph_list.c
@@ -5,13 +5,13 @@
 #include <string.h>
 #include <time.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "graph_list.h"
 #include "graph_ident.h"
 #include "graph_def.h"
 #include "graph_config.h"
 #include "common.h"
+#include "filesystem.h"
 #include "utils_params.h"
 
 #include <fcgiapp.h>
@@ -22,177 +22,58 @@
  */
 #define UPDATE_INTERVAL 10
 
-#define ANY_TOKEN "/any/"
-#define ALL_TOKEN "/all/"
-
-/*
- * Data types
- */
-struct gl_ident_stage_s /* {{{ */
-{
-  char *host;
-  char *plugin;
-  char *plugin_instance;
-  char *type;
-  char *type_instance;
-}; /* }}} */
-typedef struct gl_ident_stage_s gl_ident_stage_t;
-
-struct graph_config_s /* {{{ */
-{
-  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 */
-
 /*
  * Global variables
  */
-static graph_config_t *graph_config_head = NULL;
-static graph_config_t *graph_config_staging = NULL;
+static graph_config_t **gl_active = NULL;
+static size_t gl_active_num = 0;
+
+static graph_config_t **gl_staging = NULL;
+static size_t gl_staging_num = 0;
 
 static time_t gl_last_update = 0;
 
 /*
  * Private functions
  */
-#if 0
-/* "Safe" version of strcmp(3): Either or both pointers may be NULL. */
-static int strcmp_s (const char *s1, const char *s2) /* {{{ */
+int gl_add_graph_internal (graph_config_t *cfg, /* {{{ */
+    graph_config_t ***gl_array, size_t *gl_array_num)
 {
-  if ((s1 == NULL) && (s2 == NULL))
-    return (0);
-  else if (s1 == NULL)
-    return (1);
-  else if (s2 == NULL)
-    return (-1);
-  assert ((s1 != NULL) && (s2 != NULL));
-
-  return (strcmp (s1, s2));
-} /* }}} int strcmp_s */
-#endif
-
-/*
- * 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.
- */
+  graph_config_t **tmp;
 
-static graph_instance_t *graph_find_instance (graph_config_t *cfg, /* {{{ */
-    const graph_ident_t *ident)
-{
-  if ((cfg == NULL) || (ident == NULL))
-    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) /* {{{ */
-{
-  graph_instance_t *inst;
-
-  inst = graph_find_instance (cfg, file);
-  if (inst == NULL)
-  {
-    inst = inst_create (cfg, file);
-    if (inst == NULL)
-      return (ENOMEM);
-
-    if (cfg->instances == NULL)
-      cfg->instances = inst;
-    else
-      inst_append (cfg->instances, inst);
-  }
-
-  return (inst_add_file (inst, file));
-} /* }}} int graph_add_file */
-
-static int graph_append (graph_config_t **head, /* {{{ */
-    graph_config_t *cfg)
-{
-  graph_config_t *last;
+#define ARRAY_PTR  (*gl_array)
+#define ARRAY_SIZE (*gl_array_num)
 
   if (cfg == NULL)
     return (EINVAL);
 
-  if (head == NULL)
-    head = &graph_config_head;
-
-  if (*head == NULL)
-  {
-    *head = cfg;
-    return (0);
-  }
+  tmp = realloc (ARRAY_PTR, sizeof (*ARRAY_PTR) * (ARRAY_SIZE + 1));
+  if (tmp == NULL)
+    return (ENOMEM);
+  ARRAY_PTR = tmp;
 
-  last = *head;
-  while (last->next != NULL)
-    last = last->next;
+  ARRAY_PTR[ARRAY_SIZE] = cfg;
+  ARRAY_SIZE++;
 
-  last->next = cfg;
+#undef ARRAY_SIZE
+#undef ARRAY_PTR
 
   return (0);
-} /* }}} int graph_append */
-
-static graph_config_t *graph_create (const graph_ident_t *selector) /* {{{ */
-{
-  graph_config_t *cfg;
-
-  cfg = malloc (sizeof (*cfg));
-  if (cfg == NULL)
-    return (NULL);
-  memset (cfg, 0, sizeof (*cfg));
-
-  if (selector != NULL)
-    cfg->select = ident_clone (selector);
-  else
-    cfg->select = NULL;
+} /* }}} int gl_add_graph_internal */
 
-  cfg->title = NULL;
-  cfg->vertical_label = NULL;
-  cfg->defs = NULL;
-  cfg->instances = NULL;
-  cfg->next = NULL;
-
-  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);
-
-  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) /* {{{ */
+static int gl_register_file (const graph_ident_t *file, /* {{{ */
+    __attribute__((unused)) void *user_data)
 {
   graph_config_t *cfg;
   int num_graphs = 0;
+  size_t i;
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  for (i = 0; i < gl_active_num; i++)
   {
+    graph_config_t *cfg = gl_active[i];
     int status;
 
-    if (!ident_matches (cfg->select, file))
+    if (!graph_matches (cfg, file))
       continue;
 
     status = graph_add_file (cfg, file);
@@ -209,120 +90,12 @@ static int register_file (const graph_ident_t *file) /* {{{ */
   if (num_graphs == 0)
   {
     cfg = graph_create (file);
-    graph_append (/* head = */ NULL, cfg);
+    gl_add_graph_internal (cfg, &gl_active, &gl_active_num);
     graph_add_file (cfg, file);
   }
 
   return (0);
-} /* }}} int register_file */
-
-static int callback_type (const char *type, void *user_data) /* {{{ */
-{
-  gl_ident_stage_t *gl;
-  graph_ident_t *ident;
-  int status;
-
-  if ((type == NULL) || (user_data == NULL))
-    return (EINVAL);
-
-  gl = user_data;
-  if ((gl->type != NULL) || (gl->type_instance != NULL))
-    return (EINVAL);
-
-  gl->type = strdup (type);
-  if (gl->type == NULL)
-    return (ENOMEM);
-
-  gl->type_instance = strchr (gl->type, '-');
-  if (gl->type_instance != NULL)
-  {
-    *gl->type_instance = 0;
-    gl->type_instance++;
-  }
-  else
-  {
-    gl->type_instance = gl->type + strlen (gl->type);
-  }
-
-  ident = ident_create (gl->host,
-      gl->plugin, gl->plugin_instance,
-      gl->type, gl->type_instance);
-  if (ident == 0)
-  {
-    status = -1;
-  }
-  else
-  {
-    status = register_file (ident);
-    ident_destroy (ident);
-  }
-
-  free (gl->type);
-  gl->type = NULL;
-  gl->type_instance = NULL;
-
-  return (status);
-} /* }}} int callback_type */
-
-static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
-{
-  gl_ident_stage_t *gl;
-  int status;
-
-  if ((plugin == NULL) || (user_data == NULL))
-    return (EINVAL);
-
-  gl = user_data;
-  if ((gl->plugin != NULL) || (gl->plugin_instance != NULL))
-    return (EINVAL);
-
-  gl->plugin = strdup (plugin);
-  if (gl->plugin == NULL)
-    return (ENOMEM);
-
-  gl->plugin_instance = strchr (gl->plugin, '-');
-  if (gl->plugin_instance != NULL)
-  {
-    *gl->plugin_instance = 0;
-    gl->plugin_instance++;
-  }
-  else
-  {
-    gl->plugin_instance = gl->plugin + strlen (gl->plugin);
-  }
-
-  status = foreach_type (gl->host, plugin, callback_type, gl);
-
-  free (gl->plugin);
-  gl->plugin = NULL;
-  gl->plugin_instance = NULL;
-
-  return (status);
-} /* }}} int callback_plugin */
-
-static int callback_host (const char *host, void *user_data) /* {{{ */
-{
-  gl_ident_stage_t *gl;
-  int status;
-
-  if ((host == NULL) || (user_data == NULL))
-    return (EINVAL);
-
-  gl = user_data;
-  if (gl->host != NULL)
-    return (EINVAL);
-
-  gl->host = strdup (host);
-  if (gl->host == NULL)
-    return (ENOMEM);
-
-  status =  foreach_plugin (host, callback_plugin, gl);
-
-  free (gl->host);
-  gl->host = NULL;
-
-  return (status);
-} /* }}} int callback_host */
+} /* }}} int gl_register_file */
 
 static const char *get_part_from_param (const char *prim_key, /* {{{ */
     const char *sec_key)
@@ -338,108 +111,44 @@ static const char *get_part_from_param (const char *prim_key, /* {{{ */
 
 static int gl_clear_instances (void) /* {{{ */
 {
-  graph_config_t *cfg;
+  size_t i;
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
-  {
-    inst_destroy (cfg->instances);
-    cfg->instances = NULL;
-  }
+  for (i = 0; i < gl_active_num; i++)
+    graph_clear_instances (gl_active[i]);
 
   return (0);
 } /* }}} int gl_clear_instances */
 
 
 /*
- * Config functions
+ * Global functions
  */
-static graph_ident_t *graph_config_get_selector (const oconfig_item_t *ci) /* {{{ */
+int gl_add_graph (graph_config_t *cfg) /* {{{ */
 {
-  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 */
+  return (gl_add_graph_internal (cfg, &gl_staging, &gl_staging_num));
+} /* }}} int gl_add_graph */
 
-/*
- * Global functions
- */
-int graph_config_add (const oconfig_item_t *ci) /* {{{ */
+int gl_config_submit (void) /* {{{ */
 {
-  graph_ident_t *select;
-  graph_config_t *cfg = NULL;
-  int i;
+  graph_config_t **old;
+  size_t old_num;
+  size_t i;
 
-  select = graph_config_get_selector (ci);
-  if (select == NULL)
-    return (EINVAL);
+  old = gl_active;
+  old_num = gl_active_num;
 
-  cfg = graph_create (/* selector = */ NULL);
-  if (cfg == NULL)
-    return (ENOMEM);
+  gl_active = gl_staging;
+  gl_active_num = gl_staging_num;
 
-  cfg->select = select;
+  gl_staging = NULL;
+  gl_staging_num = 0;
 
-  for (i = 0; i < ci->children_num; i++)
+  for (i = 0; i < old_num; i++)
   {
-    oconfig_item_t *child;
-
-    child = ci->children + i;
-
-    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 */
-
-  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);
+    graph_destroy (old[i]);
+    old[i] = NULL;
+  }
+  free (old);
 
   return (0);
 } /* }}} int graph_config_submit */
@@ -447,18 +156,18 @@ int graph_config_submit (void) /* {{{ */
 int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
     void *user_data)
 {
-  graph_config_t *cfg;
+  size_t i;
 
   if (callback == NULL)
     return (EINVAL);
 
   gl_update ();
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  for (i = 0; i < gl_active_num; i++)
   {
     int status;
 
-    status = (*callback) (cfg, user_data);
+    status = (*callback) (gl_active[i], user_data);
     if (status != 0)
       return (status);
   }
@@ -466,7 +175,7 @@ int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
   return (0);
 } /* }}} int gl_graph_get_all */
 
-graph_config_t *graph_get_selected (void) /* {{{ */
+graph_config_t *gl_graph_get_selected (void) /* {{{ */
 {
   const char *host = get_part_from_param ("graph_host", "host");
   const char *plugin = get_part_from_param ("graph_plugin", "plugin");
@@ -474,7 +183,7 @@ graph_config_t *graph_get_selected (void) /* {{{ */
   const char *type = get_part_from_param ("graph_type", "type");
   const char *type_instance = get_part_from_param ("graph_type_instance", "type_instance");
   graph_ident_t *ident;
-  graph_config_t *cfg;
+  size_t i;
 
   if ((host == NULL)
       || (plugin == NULL) || (plugin_instance == NULL)
@@ -485,18 +194,18 @@ graph_config_t *graph_get_selected (void) /* {{{ */
 
   gl_update ();
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  for (i = 0; i < gl_active_num; i++)
   {
-    if (ident_compare (ident, cfg->select) != 0)
+    if (graph_compare (gl_active[i], ident) != 0)
       continue;
 
     ident_destroy (ident);
-    return (cfg);
+    return (gl_active[i]);
   }
 
   ident_destroy (ident);
   return (NULL);
-} /* }}} graph_config_t *graph_get_selected */
+} /* }}} graph_config_t *gl_graph_get_selected */
 
 /* gl_instance_get_all, gl_graph_instance_get_all {{{ */
 struct gl_inst_callback_data /* {{{ */
@@ -527,21 +236,22 @@ int gl_graph_instance_get_all (graph_config_t *cfg, /* {{{ */
   if ((cfg == NULL) || (callback == NULL))
     return (EINVAL);
 
-  return (inst_foreach (cfg->instances, gl_inst_callback_handler, &data));
+  return (inst_foreach (graph_get_instances (cfg),
+        gl_inst_callback_handler, &data));
 } /* }}} int gl_graph_instance_get_all */
 
 int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
     void *user_data)
 {
-  graph_config_t *cfg;
+  size_t i;
 
   gl_update ();
 
-  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  for (i = 0; i < gl_active_num; i++)
   {
     int status;
 
-    status = gl_graph_instance_get_all (cfg, callback, user_data);
+    status = gl_graph_instance_get_all (gl_active[i], callback, user_data);
     if (status != 0)
       return (status);
   }
@@ -550,66 +260,9 @@ int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
 } /* }}} 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)
-{
-  if ((cfg == NULL) || (buffer == NULL) || (buffer_size < 1))
-    return (EINVAL);
-
-  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 */
-
-graph_instance_t *gl_graph_get_instances (graph_config_t *cfg) /* {{{ */
-{
-  if (cfg == NULL)
-    return (NULL);
-
-  return (cfg->instances);
-} /* }}} graph_instance_t *gl_graph_get_instances */
-
-graph_def_t *gl_graph_get_defs (graph_config_t *cfg) /* {{{ */
-{
-  if (cfg == NULL)
-    return (NULL);
-
-  return (cfg->defs);
-} /* }}} graph_def_t *gl_graph_get_defs */
-
-int gl_graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */
-{
-  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 */
-
 int gl_update (void) /* {{{ */
 {
   time_t now;
-  gl_ident_stage_t gl;
   int status;
 
   /*
@@ -623,15 +276,8 @@ int gl_update (void) /* {{{ */
 
   graph_read_config ();
 
-  memset (&gl, 0, sizeof (gl));
-  gl.host = NULL;
-  gl.plugin = NULL;
-  gl.plugin_instance = NULL;
-  gl.type = NULL;
-  gl.type_instance = NULL;
-
   gl_clear_instances ();
-  status = foreach_host (callback_host, &gl);
+  status = fs_scan (/* callback = */ gl_register_file, /* user data = */ NULL);
 
   gl_last_update = now;