X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=graph_list.c;h=965fcbac4f6caad5913b9a0097dd2937ec773ffb;hp=eeab51a05190eef6f21ad2a36f9d21c174bcdd3f;hb=af2ed61b280e1ec169aba2bcb9df30ac76b006d2;hpb=58d184eb1a59b534b57f3c1a13da9df1cb280ef4

diff --git a/graph_list.c b/graph_list.c
index eeab51a..965fcba 100644
--- a/graph_list.c
+++ b/graph_list.c
@@ -1,278 +1,287 @@
 #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 "filesystem.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;
+/*
+ * Global variables
+ */
+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;
 
-/* "Safe" version of strcmp(3): Either or both pointers may be NULL. */
-static int strcmp_s (const char *s1, const char *s2) /* {{{ */
+/*
+ * Private functions
+ */
+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));
+  graph_config_t **tmp;
+
+#define ARRAY_PTR  (*gl_array)
+#define ARRAY_SIZE (*gl_array_num)
 
-  return (strcmp (s1, s2));
-} /* }}} int strcmp_s */
+  if (cfg == NULL)
+    return (EINVAL);
 
-static int gl_compare (const void *p0, const void *p1) /* {{{ */
+  tmp = realloc (ARRAY_PTR, sizeof (*ARRAY_PTR) * (ARRAY_SIZE + 1));
+  if (tmp == NULL)
+    return (ENOMEM);
+  ARRAY_PTR = tmp;
+
+  ARRAY_PTR[ARRAY_SIZE] = cfg;
+  ARRAY_SIZE++;
+
+#undef ARRAY_SIZE
+#undef ARRAY_PTR
+
+  return (0);
+} /* }}} int gl_add_graph_internal */
+
+static int gl_register_file (const graph_ident_t *file, /* {{{ */
+    __attribute__((unused)) void *user_data)
 {
-  const graph_list_t *gl0 = p0;
-  const graph_list_t *gl1 = p1;
-  int status;
+  graph_config_t *cfg;
+  int num_graphs = 0;
+  size_t i;
 
-  status = strcmp (gl0->host, gl1->host);
-  if (status != 0)
-    return (status);
+  for (i = 0; i < gl_active_num; i++)
+  {
+    graph_config_t *cfg = gl_active[i];
+    int status;
 
-  status = strcmp (gl0->plugin, gl1->plugin);
-  if (status != 0)
-    return (status);
+    if (!graph_matches (cfg, file))
+      continue;
 
-  status = strcmp_s (gl0->plugin_instance, gl1->plugin_instance);
-  if (status != 0)
-    return (status);
+    status = graph_add_file (cfg, file);
+    if (status != 0)
+    {
+      /* report error */;
+    }
+    else
+    {
+      num_graphs++;
+    }
+  }
 
-  status = strcmp (gl0->type, gl1->type);
-  if (status != 0)
-    return (status);
+  if (num_graphs == 0)
+  {
+    cfg = graph_create (file);
+    gl_add_graph_internal (cfg, &gl_active, &gl_active_num);
+    graph_add_file (cfg, file);
+  }
 
-  return (strcmp_s (gl0->type_instance, gl1->type_instance));
-} /* }}} int gl_compare */
+  return (0);
+} /* }}} int gl_register_file */
 
-static void gl_clear_entry (graph_list_t *gl) /* {{{ */
+static const char *get_part_from_param (const char *prim_key, /* {{{ */
+    const char *sec_key)
 {
-  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) /* {{{ */
+  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) /* {{{ */
 {
   size_t i;
 
-  for (i = 0; i < graph_list_length; i++)
-    gl_clear_entry (graph_list + i);
+  for (i = 0; i < gl_active_num; i++)
+    graph_clear_instances (gl_active[i]);
 
-  free (graph_list);
-  graph_list = NULL;
-  graph_list_length = 0;
-  gl_last_update = 0;
-} /* }}} void gl_clear */
+  return (0);
+} /* }}} int gl_clear_instances */
 
-static int gl_add_copy (graph_list_t *gl) /* {{{ */
+
+/*
+ * Global functions
+ */
+int gl_add_graph (graph_config_t *cfg) /* {{{ */
 {
-  graph_list_t *ptr;
-  int status;
+  return (gl_add_graph_internal (cfg, &gl_staging, &gl_staging_num));
+} /* }}} int gl_add_graph */
 
-  if (gl == NULL)
-    return (EINVAL);
+int gl_config_submit (void) /* {{{ */
+{
+  graph_config_t **old;
+  size_t old_num;
+  size_t i;
 
-  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);
+  old = gl_active;
+  old_num = gl_active_num;
 
-    status = 0;
-  } while (0);
+  gl_active = gl_staging;
+  gl_active_num = gl_staging_num;
 
-#undef DUP_OR_BREAK
+  gl_staging = NULL;
+  gl_staging_num = 0;
 
-  if (status != 0)
+  for (i = 0; i < old_num; i++)
   {
-    free (ptr->host);
-    free (ptr->plugin);
-    free (ptr->plugin_instance);
-    free (ptr->type);
-    free (ptr->type_instance);
-    return (status);
+    graph_destroy (old[i]);
+    old[i] = NULL;
   }
+  free (old);
 
-  graph_list_length++;
   return (0);
-} /* }}} int gl_add_copy */
+} /* }}} int graph_config_submit */
 
-static int callback_type (const char *type, void *user_data) /* {{{ */
+int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
+    void *user_data)
 {
-  graph_list_t *gl;
-  int status;
-
-  if ((type == NULL) || (user_data == NULL))
-    return (EINVAL);
+  size_t i;
 
-  gl = user_data;
-  if ((gl->type != NULL) || (gl->type_instance != NULL))
+  if (callback == NULL)
     return (EINVAL);
 
-  gl->type = strdup (type);
-  if (gl->type == NULL)
-    return (ENOMEM);
+  gl_update ();
 
-  gl->type_instance = strchr (gl->type, '-');
-  if (gl->type_instance != NULL)
+  for (i = 0; i < gl_active_num; i++)
   {
-    *gl->type_instance = 0;
-    gl->type_instance++;
-  }
-
-  status = gl_add_copy (gl);
+    int status;
 
-  free (gl->type);
-  gl->type = NULL;
-  gl->type_instance = NULL;
+    status = (*callback) (gl_active[i], user_data);
+    if (status != 0)
+      return (status);
+  }
 
-  return (status);
-} /* }}} int callback_type */
+  return (0);
+} /* }}} int gl_graph_get_all */
 
-static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
+graph_config_t *gl_graph_get_selected (void) /* {{{ */
 {
-  graph_list_t *gl;
-  int status;
+  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;
+  size_t i;
 
-  if ((plugin == NULL) || (user_data == NULL))
-    return (EINVAL);
+  if ((host == NULL)
+      || (plugin == NULL) || (plugin_instance == NULL)
+      || (type == NULL) || (type_instance == NULL))
+    return (NULL);
 
-  gl = user_data;
-  if ((gl->plugin != NULL) || (gl->plugin_instance != NULL))
-    return (EINVAL);
+  ident = ident_create (host, plugin, plugin_instance, type, type_instance);
 
-  gl->plugin = strdup (plugin);
-  if (gl->plugin == NULL)
-    return (ENOMEM);
+  gl_update ();
 
-  gl->plugin_instance = strchr (gl->plugin, '-');
-  if (gl->plugin_instance != NULL)
+  for (i = 0; i < gl_active_num; i++)
   {
-    *gl->plugin_instance = 0;
-    gl->plugin_instance++;
+    if (graph_compare (gl_active[i], ident) != 0)
+      continue;
+
+    ident_destroy (ident);
+    return (gl_active[i]);
   }
 
-  status = foreach_type (gl->host, plugin, callback_type, gl);
+  ident_destroy (ident);
+  return (NULL);
+} /* }}} graph_config_t *gl_graph_get_selected */
 
-  free (gl->plugin);
-  gl->plugin = NULL;
-  gl->plugin_instance = NULL;
+/* 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 */
 
-  return (status);
-} /* }}} int callback_plugin */
+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 */
 
-static int callback_host (const char *host, void *user_data) /* {{{ */
+int gl_graph_instance_get_all (graph_config_t *cfg, /* {{{ */
+    gl_inst_callback callback, void *user_data)
 {
-  graph_list_t *gl;
-  int status;
+  struct gl_inst_callback_data data =
+  {
+    cfg,
+    callback,
+    user_data
+  };
 
-  if ((host == NULL) || (user_data == NULL))
+  if ((cfg == NULL) || (callback == NULL))
     return (EINVAL);
 
-  gl = user_data;
-  if (gl->host != NULL)
-    return (EINVAL);
+  return (inst_foreach (graph_get_instances (cfg),
+        gl_inst_callback_handler, &data));
+} /* }}} int gl_graph_instance_get_all */
 
-  gl->host = strdup (host);
-  if (gl->host == NULL)
-    return (ENOMEM);
+int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
+    void *user_data)
+{
+  size_t i;
 
-  status =  foreach_plugin (host, callback_plugin, gl);
+  gl_update ();
 
-  free (gl->host);
-  gl->host = NULL;
+  for (i = 0; i < gl_active_num; i++)
+  {
+    int status;
 
-  return (status);
-} /* }}} int callback_host */
+    status = gl_graph_instance_get_all (gl_active[i], 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_update (void) /* {{{ */
 {
   time_t now;
-  graph_list_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 ();
-
-  memset (&gl, 0, sizeof (gl));
-  gl.host = NULL;
-  gl.plugin = NULL;
-  gl.plugin_instance = NULL;
-  gl.type = NULL;
-  gl.type_instance = NULL;
+  graph_read_config ();
 
-  status = foreach_host (callback_host, &gl);
+  gl_clear_instances ();
+  status = fs_scan (/* callback = */ gl_register_file, /* user data = */ NULL);
 
-  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) (graph_list + i, user_data);
-    if (status != 0)
-      return (status);
-  }
-
-  return (0);
-} /* }}} int gl_foreach */
-
 /* vim: set sw=2 sts=2 et fdm=marker : */