diff --git a/src/graph.c b/src/graph.c
index f6f40d57c3668230e42b25dee8e4cffb51ee1d9d..8d12a25a1606d397d4ac20e66cb91fe9b45af9ee 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
#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"
#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); \
return (def_append (cfg->defs, def));
} /* }}} 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 */
+
+_Bool graph_matches_field (graph_config_t *cfg, /* {{{ */
+ graph_ident_field_t field, const char *field_value)
+{
+ const char *selector_value;
+
+ 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)
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)
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_inst_search_field */
+
int graph_compare (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
{
if ((cfg == NULL) || (ident == NULL))
} /* }}} 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);