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

diff --git a/graph_list.c b/graph_list.c
index 1306335..5b37f2d 100644
--- a/graph_list.c
+++ b/graph_list.c
@@ -1,111 +1,225 @@
 #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 "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
+ */
 #define UPDATE_INTERVAL 10
 
-static graph_list_t *graph_list = NULL;
-static size_t graph_list_length = 0;
-static time_t gl_last_update = 0;
+#define ANY_TOKEN "/any/"
+#define ALL_TOKEN "/all/"
 
-static void gl_clear_entry (graph_list_t *gl) /* {{{ */
+/*
+ * Data types
+ */
+struct gl_ident_stage_s /* {{{ */
 {
-  if (gl == NULL)
-    return;
+  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;
 
-  free (gl->host);
-  free (gl->plugin);
-  free (gl->plugin_instance);
-  free (gl->type);
-  free (gl->type_instance);
+  char *title;
+  char *vertical_label;
 
-  gl->host = NULL;
-  gl->plugin = NULL;
-  gl->plugin_instance = NULL;
-  gl->type = NULL;
-  gl->type_instance = NULL;
-} /* }}} void gl_clear_entry */
+  graph_def_t *defs;
 
-static void gl_clear (void)
+  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 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) /* {{{ */
+{
+  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.
+ */
+
+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) /* {{{ */
 {
-  size_t i;
+  graph_instance_t *inst;
 
-  for (i = 0; i < graph_list_length; i++)
-    gl_clear_entry (graph_list + i);
+  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);
+  }
 
-  free (graph_list);
-  graph_list = NULL;
-  graph_list_length = 0;
-  gl_last_update = 0;
-} /* }}} void gl_clear */
+  return (inst_add_file (inst, file));
+} /* }}} int graph_add_file */
 
-static int gl_add_copy (graph_list_t *gl) /* {{{ */
+static int graph_append (graph_config_t **head, /* {{{ */
+    graph_config_t *cfg)
 {
-  graph_list_t *ptr;
-  int status;
+  graph_config_t *last;
 
-  if (gl == NULL)
+  if (cfg == 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);
+  if (head == NULL)
+    head = &graph_config_head;
+
+  if (*head == NULL)
+  {
+    *head = cfg;
+    return (0);
   }
 
-  graph_list_length++;
+  last = *head;
+  while (last->next != NULL)
+    last = last->next;
+
+  last->next = cfg;
+
   return (0);
-} /* }}} int gl_add_copy */
+} /* }}} 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;
+
+  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) /* {{{ */
+{
+  graph_config_t *cfg;
+  int num_graphs = 0;
+
+  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  {
+    int status;
+
+    if (!ident_matches (cfg->select, file))
+      continue;
+
+    status = graph_add_file (cfg, file);
+    if (status != 0)
+    {
+      /* report error */;
+    }
+    else
+    {
+      num_graphs++;
+    }
+  }
+
+  if (num_graphs == 0)
+  {
+    cfg = graph_create (file);
+    graph_append (/* head = */ NULL, cfg);
+    graph_add_file (cfg, file);
+  }
+
+  return (0);
+} /* }}} int register_file */
 
 static int callback_type (const char *type, void *user_data) /* {{{ */
 {
-  graph_list_t *gl;
+  gl_ident_stage_t *gl;
+  graph_ident_t *ident;
   int status;
 
   if ((type == NULL) || (user_data == NULL))
@@ -125,8 +239,23 @@ static int callback_type (const char *type, void *user_data) /* {{{ */
     *gl->type_instance = 0;
     gl->type_instance++;
   }
+  else
+  {
+    gl->type_instance = gl->type + strlen (gl->type);
+  }
 
-  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;
@@ -137,7 +266,7 @@ static int callback_type (const char *type, void *user_data) /* {{{ */
 
 static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
 {
-  graph_list_t *gl;
+  gl_ident_stage_t *gl;
   int status;
 
   if ((plugin == NULL) || (user_data == NULL))
@@ -157,6 +286,10 @@ static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
     *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);
 
@@ -169,7 +302,7 @@ static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
 
 static int callback_host (const char *host, void *user_data) /* {{{ */
 {
-  graph_list_t *gl;
+  gl_ident_stage_t *gl;
   int status;
 
   if ((host == NULL) || (user_data == NULL))
@@ -191,18 +324,304 @@ static int callback_host (const char *host, void *user_data) /* {{{ */
   return (status);
 } /* }}} int callback_host */
 
+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 */
+
+static int gl_clear_instances (void) /* {{{ */
+{
+  graph_config_t *cfg;
+
+  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  {
+    inst_destroy (cfg->instances);
+    cfg->instances = NULL;
+  }
+
+  return (0);
+} /* }}} int gl_clear_instances */
+
+
+/*
+ * 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
+ */
+int graph_config_add (const oconfig_item_t *ci) /* {{{ */
+{
+  graph_ident_t *select;
+  graph_config_t *cfg = NULL;
+  int i;
+
+  select = graph_config_get_selector (ci);
+  if (select == NULL)
+    return (EINVAL);
+
+  cfg = graph_create (/* selector = */ NULL);
+  if (cfg == NULL)
+    return (ENOMEM);
+
+  cfg->select = select;
+
+  for (i = 0; i < ci->children_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);
+
+  return (0);
+} /* }}} int graph_config_submit */
+
+int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
+    void *user_data)
+{
+  graph_config_t *cfg;
+
+  if (callback == NULL)
+    return (EINVAL);
+
+  gl_update ();
+
+  for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+  {
+    int status;
+
+    status = (*callback) (cfg, user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int gl_graph_get_all */
+
+graph_config_t *graph_get_selected (void) /* {{{ */
+{
+  const char *host = get_part_from_param ("graph_host", "host");
+  const char *plugin = get_part_from_param ("graph_plugin", "plugin");
+  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))
+    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 (ident_compare (ident, cfg->select) != 0)
+      continue;
+
+    ident_destroy (ident);
+    return (cfg);
+  }
+
+  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)
+{
+  struct gl_inst_callback_data data =
+  {
+    cfg,
+    callback,
+    user_data
+  };
+
+  if ((cfg == NULL) || (callback == NULL))
+    return (EINVAL);
+
+  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 = gl_graph_instance_get_all (cfg, callback, user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} 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;
-  graph_list_t gl;
+  gl_ident_stage_t gl;
   int status;
 
+  /*
+  printf ("Content-Type: text/plain\n\n");
+  */
+
   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;
@@ -211,26 +630,12 @@ int gl_update (void) /* {{{ */
   gl.type = NULL;
   gl.type_instance = NULL;
 
-  /* TODO: Free old list */
-
+  gl_clear_instances ();
   status = foreach_host (callback_host, &gl);
-  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;
+  gl_last_update = now;
 
-    status = (*callback) (graph_list + i, user_data);
-    if (status != 0)
-      return (status);
-  }
-
-  return (0);
-} /* }}} int gl_foreach */
+  return (status);
+} /* }}} int gl_update */
 
 /* vim: set sw=2 sts=2 et fdm=marker : */