X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph.c;h=5c143b46641c3b8aafebddd1bc2f00898f433c8a;hb=d746867e2a940a8f752e781c866243f775777338;hp=d314bcc1af2070acf4019f5765922096494a4df5;hpb=7ef6ca1ae6310242938b74bd1e79c51e4373534f;p=collection4.git

diff --git a/src/graph.c b/src/graph.c
index d314bcc..5c143b4 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,3 +1,26 @@
+/**
+ * collection4 - graph.c
+ * Copyright (C) 2010  Florian octo Forster
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Florian octo Forster <ff at octo.it>
+ **/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -8,8 +31,9 @@
 #include <assert.h>
 
 #include "graph.h"
-#include "graph_list.h"
 #include "graph_ident.h"
+#include "graph_instance.h"
+#include "graph_list.h"
 #include "graph_def.h"
 #include "graph_config.h"
 #include "common.h"
@@ -32,20 +56,13 @@ struct graph_config_s /* {{{ */
 
   graph_def_t *defs;
 
-  graph_instance_t *instances;
+  graph_instance_t **instances;
+  size_t instances_num;
 }; /* }}} struct graph_config_s */
 
 /*
  * Private functions
  */
-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 */
 
 /*
  * Config functions
@@ -117,6 +134,8 @@ graph_config_t *graph_create (const graph_ident_t *selector) /* {{{ */
 
 void graph_destroy (graph_config_t *cfg) /* {{{ */
 {
+  size_t i;
+
   if (cfg == NULL)
     return;
 
@@ -126,7 +145,10 @@ void graph_destroy (graph_config_t *cfg) /* {{{ */
   free (cfg->vertical_label);
 
   def_destroy (cfg->defs);
-  inst_destroy (cfg->instances);
+
+  for (i = 0; i < cfg->instances_num; i++)
+    inst_destroy (cfg->instances[i]);
+  free (cfg->instances);
 } /* }}} void graph_destroy */
 
 int graph_config_add (const oconfig_item_t *ci) /* {{{ */
@@ -170,17 +192,23 @@ int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
 {
   graph_instance_t *inst;
 
-  inst = graph_find_instance (cfg, file);
+  inst = graph_inst_find_matching (cfg, file);
   if (inst == NULL)
   {
+    graph_instance_t **tmp;
+
+    tmp = realloc (cfg->instances,
+        sizeof (*cfg->instances) * (cfg->instances_num + 1));
+    if (tmp == NULL)
+      return (ENOMEM);
+    cfg->instances = tmp;
+
     inst = inst_create (cfg, file);
     if (inst == NULL)
       return (ENOMEM);
 
-    if (cfg->instances == NULL)
-      cfg->instances = inst;
-    else
-      inst_append (cfg->instances, inst);
+    cfg->instances[cfg->instances_num] = inst;
+    cfg->instances_num++;
   }
 
   return (inst_add_file (inst, file));
@@ -204,21 +232,42 @@ int graph_get_title (graph_config_t *cfg, /* {{{ */
   return (0);
 } /* }}} int graph_get_title */
 
-graph_ident_t *graph_get_selector (graph_config_t *cfg) /* {{{ */
+int graph_get_params (graph_config_t *cfg, /* {{{ */
+    char *buffer, size_t buffer_size)
 {
-  if (cfg == NULL)
-    return (NULL);
+  buffer[0] = 0;
+
+#define COPY_FIELD(field) do {                                       \
+  const char *str = ident_get_##field (cfg->select);                 \
+  char uri_str[1024];                                                \
+  uri_escape_copy (uri_str, str, sizeof (uri_str));                  \
+  strlcat (buffer, #field, buffer_size);                             \
+  strlcat (buffer, "=", buffer_size);                                \
+  strlcat (buffer, uri_str, 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 (ident_clone (cfg->select));
-} /* }}} graph_ident_t *graph_get_selector */
+  return (0);
+} /* }}} int graph_get_params */
 
-graph_instance_t *graph_get_instances (graph_config_t *cfg) /* {{{ */
+graph_ident_t *graph_get_selector (graph_config_t *cfg) /* {{{ */
 {
   if (cfg == NULL)
     return (NULL);
 
-  return (cfg->instances);
-} /* }}} graph_instance_t *graph_get_instances */
+  return (ident_clone (cfg->select));
+} /* }}} graph_ident_t *graph_get_selector */
 
 graph_def_t *graph_get_defs (graph_config_t *cfg) /* {{{ */
 {
@@ -230,6 +279,8 @@ graph_def_t *graph_get_defs (graph_config_t *cfg) /* {{{ */
 
 int graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */
 {
+  graph_def_t *tmp;
+
   if ((cfg == NULL) || (def == NULL))
     return (EINVAL);
 
@@ -239,48 +290,123 @@ int graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */
     return (0);
   }
 
-  return (def_append (cfg->defs, def));
+  /* Insert in reverse order. This makes the order in the config file and the
+   * order of the DEFs in the graph more natural. Really. */
+  tmp = cfg->defs;
+  cfg->defs = def;
+  return (def_append (cfg->defs, tmp));
 } /* }}} int graph_add_def */
 
-_Bool graph_matches (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
+_Bool graph_matches_ident (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
 {
   if ((cfg == NULL) || (ident == NULL))
     return (0);
 
   return (ident_matches (cfg->select, ident));
-} /* }}} _Bool graph_matches */
+} /* }}} _Bool graph_matches_ident */
 
-struct graph_search_data_s
+_Bool graph_matches_field (graph_config_t *cfg, /* {{{ */
+    graph_ident_field_t field, const char *field_value)
 {
-  graph_config_t *cfg;
-  graph_inst_callback_t callback;
-  void *user_data;
-};
-typedef struct graph_search_data_s graph_search_data_t;
+  const char *selector_value;
 
-static int graph_search_submit (graph_instance_t *inst, /* {{{ */
-    void *user_data)
+  if ((cfg == NULL) || (field_value == NULL))
+    return (0);
+
+  selector_value = ident_get_field (cfg->select, field);
+  if (selector_value == NULL)
+    return (0);
+
+  if (IS_ALL (selector_value) || IS_ANY (selector_value))
+    return (1);
+  else if (strcasecmp (selector_value, field_value) == 0)
+    return (1);
+
+  return (0);
+} /* }}} _Bool graph_matches_field */
+
+int graph_inst_foreach (graph_config_t *cfg, /* {{{ */
+		inst_callback_t cb, void *user_data)
+{
+  size_t i;
+  int status;
+
+  for (i = 0; i < cfg->instances_num; i++)
+  {
+    status = (*cb) (cfg->instances[i], user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int graph_inst_foreach */
+
+graph_instance_t *graph_inst_find_exact (graph_config_t *cfg, /* {{{ */
+    graph_ident_t *ident)
 {
-  graph_search_data_t *data = user_data;
+  size_t i;
+
+  if ((cfg == NULL) || (ident == NULL))
+    return (NULL);
+
+  for (i = 0; i < cfg->instances_num; i++)
+    if (inst_compare_ident (cfg->instances[i], ident) == 0)
+      return (cfg->instances[i]);
+
+  return (NULL);
+} /* }}} graph_instance_t *graph_inst_find_exact */
 
-  if ((inst == NULL) || (data == NULL))
+graph_instance_t *graph_inst_find_matching (graph_config_t *cfg, /* {{{ */
+    const graph_ident_t *ident)
+{
+  size_t i;
+
+  if ((cfg == NULL) || (ident == NULL))
+    return (NULL);
+
+  for (i = 0; i < cfg->instances_num; i++)
+    if (inst_ident_matches (cfg->instances[i], ident))
+      return (cfg->instances[i]);
+
+  return (NULL);
+} /* }}} graph_instance_t *graph_inst_find_matching */
+
+int graph_inst_find_all_matching (graph_config_t *cfg, /* {{{ */
+    const graph_ident_t *ident,
+    graph_inst_callback_t callback, void *user_data)
+{
+  size_t i;
+
+  if ((cfg == NULL) || (ident == NULL) || (callback == NULL))
     return (EINVAL);
 
-  return ((*data->callback) (data->cfg, inst, data->user_data));
-} /* }}} int graph_search_submit */
+  for (i = 0; i < cfg->instances_num; i++)
+  {
+    int status;
+
+    if (!inst_matches_ident (cfg->instances[i], ident))
+      continue;
+
+    status = (*callback) (cfg, cfg->instances[i], user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int graph_inst_find_all_matching */
 
-int graph_search (graph_config_t *cfg, const char *term, /* {{{ */
-    graph_inst_callback_t callback,
+int graph_inst_search (graph_config_t *cfg, const char *term, /* {{{ */
+    graph_inst_callback_t cb,
     void *user_data)
 {
-  graph_search_data_t data = { cfg, callback, user_data };
   char buffer[1024];
   int status;
+  size_t i;
 
   status = graph_get_title (cfg, buffer, sizeof (buffer));
   if (status != 0)
   {
-    fprintf (stderr, "graph_search: graph_get_title failed\n");
+    fprintf (stderr, "graph_inst_search: graph_get_title failed\n");
     return (status);
   }
 
@@ -288,20 +414,65 @@ int graph_search (graph_config_t *cfg, const char *term, /* {{{ */
 
   if (strstr (buffer, term) != NULL)
   {
-    status = inst_foreach (cfg->instances, graph_search_submit, &data);
-    if (status != 0)
-      return (status);
+    for (i = 0; i < cfg->instances_num; i++)
+    {
+      status = (*cb) (cfg, cfg->instances[i], user_data);
+      if (status != 0)
+        return (status);
+    }
   }
   else
   {
-    status = inst_search (cfg, cfg->instances, term,
-        graph_search_submit, &data);
+    for (i = 0; i < cfg->instances_num; i++)
+    {
+      if (inst_matches_string (cfg, cfg->instances[i], term))
+      {
+        status = (*cb) (cfg, cfg->instances[i], user_data);
+        if (status != 0)
+          return (status);
+      }
+    }
+  }
+
+  return (0);
+} /* }}} int graph_inst_search */
+
+int graph_inst_search_field (graph_config_t *cfg, /* {{{ */
+    graph_ident_field_t field, const char *field_value,
+    graph_inst_callback_t callback, void *user_data)
+{
+  size_t i;
+  const char *selector_field;
+  _Bool need_check_instances = 0;
+
+  if ((cfg == NULL) || (field_value == NULL) || (callback == NULL))
+    return (EINVAL);
+
+  if (!graph_matches_field (cfg, field, field_value))
+    return (0);
+
+  selector_field = ident_get_field (cfg->select, field);
+  if (selector_field == NULL)
+    return (-1);
+
+  if (IS_ALL (selector_field) || IS_ANY (selector_field))
+    need_check_instances = 1;
+
+  for (i = 0; i < cfg->instances_num; i++)
+  {
+    int status;
+
+    if (need_check_instances
+        && !inst_matches_field (cfg->instances[i], field, field_value))
+      continue;
+
+    status = (*callback) (cfg, cfg->instances[i], user_data);
     if (status != 0)
       return (status);
   }
 
   return (0);
-} /* }}} int graph_search */
+} /* }}} int graph_inst_search_field */
 
 int graph_compare (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
 {
@@ -313,37 +484,42 @@ int graph_compare (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
 
 int graph_clear_instances (graph_config_t *cfg) /* {{{ */
 {
+  size_t i;
+
   if (cfg == NULL)
     return (EINVAL);
 
-  inst_destroy (cfg->instances);
+  for (i = 0; i < cfg->instances_num; i++)
+    inst_destroy (cfg->instances[i]);
+  free (cfg->instances);
   cfg->instances = NULL;
+  cfg->instances_num = 0;
 
   return (0);
 } /* }}} int graph_clear_instances */
 
 int graph_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
-    str_array_t *args)
+    rrd_args_t *args)
 {
   if ((cfg == NULL) || (inst == NULL) || (args == NULL))
     return (EINVAL);
 
   if (cfg->title != NULL)
   {
-    array_append (args, "-t");
-    array_append (args, cfg->title);
+    array_append (args->options, "-t");
+    array_append (args->options, cfg->title);
   }
 
   if (cfg->vertical_label != NULL)
   {
-    array_append (args, "-v");
-    array_append (args, cfg->vertical_label);
+    array_append (args->options, "-v");
+    array_append (args->options, cfg->vertical_label);
   }
 
   if (cfg->show_zero)
   {
-    array_append (args, "-l");
-    array_append (args, "0");
+    array_append (args->options, "-l");
+    array_append (args->options, "0");
   }
 
   return (0);