diff --git a/src/graph.c b/src/graph.c
index 4ed2d155c7988e9c24bcfe14dba09d90c0b920d5..66dbd47207e377211457c7e1bf0b24cb78e92288 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
+/**
+ * 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>
int graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */
{
+ graph_def_t *tmp;
+
if ((cfg == NULL) || (def == NULL))
return (EINVAL);
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) /* {{{ */
+_Bool graph_ident_matches (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_ident_matches */
+
+_Bool graph_matches_ident (graph_config_t *cfg, /* {{{ */
+ const graph_ident_t *selector)
+{
+#if C4_DEBUG
+ if ((cfg == NULL) || (selector == NULL))
+ return (0);
+#endif
+
+ return (ident_matches (selector, cfg->select));
} /* }}} _Bool graph_matches_ident */
_Bool graph_matches_field (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_search (graph_config_t *cfg, const char *term, /* {{{ */
+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_search_inst_string (graph_config_t *cfg, const char *term, /* {{{ */
graph_inst_callback_t cb,
void *user_data)
{
status = graph_get_title (cfg, buffer, sizeof (buffer));
if (status != 0)
{
- fprintf (stderr, "graph_inst_search: graph_get_title failed\n");
+ fprintf (stderr, "graph_search_inst_string: graph_get_title failed\n");
return (status);
}
}
return (0);
-} /* }}} int graph_inst_search */
+} /* }}} int graph_search_inst_string */
int graph_inst_search_field (graph_config_t *cfg, /* {{{ */
graph_ident_field_t field, const char *field_value,
return (ident_compare (cfg->select, ident));
} /* }}} int graph_compare */
+static int graph_sort_instances_cb (const void *v0, const void *v1) /* {{{ */
+{
+ return (inst_compare (*(graph_instance_t * const *) v0,
+ *(graph_instance_t * const *) v1));
+} /* }}} int graph_sort_instances_cb */
+
+size_t graph_num_instances (graph_config_t *cfg) /* {{{ */
+{
+ if (cfg == NULL)
+ return ((size_t) -1);
+
+ return (cfg->instances_num);
+} /* }}} size_t graph_num_instances */
+
+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),
+ graph_sort_instances_cb);
+
+ return (0);
+} /* }}} int graph_sort_instances */
+
int graph_clear_instances (graph_config_t *cfg) /* {{{ */
{
size_t i;
} /* }}} 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);