X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph.c;h=9d435c2385d3096921abeee8be92be5a9bf95f71;hb=5dd3410614f199791a773e82bc4236c6ea6e7e5c;hp=3962fec8d4588dcb99e670b4527ec2704ff0b3fb;hpb=bd4c412a357988288796a473ad0ea7adb6745db0;p=collection4.git

diff --git a/src/graph.c b/src/graph.c
index 3962fec..9d435c2 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>
@@ -217,7 +240,7 @@ int graph_get_params (graph_config_t *cfg, /* {{{ */
 #define COPY_FIELD(field) do {                                       \
   const char *str = ident_get_##field (cfg->select);                 \
   char uri_str[1024];                                                \
-  uri_escape (uri_str, str, sizeof (uri_str));                       \
+  uri_escape_copy (uri_str, str, sizeof (uri_str));                  \
   strlcat (buffer, #field, buffer_size);                             \
   strlcat (buffer, "=", buffer_size);                                \
   strlcat (buffer, uri_str, buffer_size);                            \
@@ -256,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);
 
@@ -265,13 +290,19 @@ 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_ident (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
 {
+#if C4_DEBUG
   if ((cfg == NULL) || (ident == NULL))
     return (0);
+#endif
 
   return (ident_matches (cfg->select, ident));
 } /* }}} _Bool graph_matches_ident */
@@ -336,12 +367,36 @@ graph_instance_t *graph_inst_find_matching (graph_config_t *cfg, /* {{{ */
     return (NULL);
 
   for (i = 0; i < cfg->instances_num; i++)
-    if (inst_matches_ident (cfg->instances[i], ident))
+    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);
+
+  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_inst_search (graph_config_t *cfg, const char *term, /* {{{ */
     graph_inst_callback_t cb,
     void *user_data)
@@ -429,6 +484,20 @@ int graph_compare (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
   return (ident_compare (cfg->select, ident));
 } /* }}} int graph_compare */
 
+int graph_sort_instances (graph_config_t *cfg) /* {{{ */
+{
+  if (cfg == NULL)
+    return (EINVAL);
+
+  if (cfg->instances_num < 2)
+    return (0);
+
+  qsort (cfg->instances, cfg->instances_num, sizeof (*cfg->instances),
+      (void *) ident_compare);
+
+  return (0);
+} /* }}} int graph_sort_instances */
+
 int graph_clear_instances (graph_config_t *cfg) /* {{{ */
 {
   size_t i;
@@ -446,27 +515,27 @@ int graph_clear_instances (graph_config_t *cfg) /* {{{ */
 } /* }}} 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);