diff --git a/src/graph.h b/src/graph.h
index 7f1115ce6215e7d9501f2dfdb712fc59ed8543da..d303a8515e728c9e961bf95c69097473cb98e468 100644 (file)
--- a/src/graph.h
+++ b/src/graph.h
#define GRAPH_H 1
#include "graph_types.h"
+#include "graph_ident.h"
#include "oconfig.h"
#include "utils_array.h"
graph_ident_t *graph_get_selector (graph_config_t *cfg);
-graph_instance_t *graph_get_instances (graph_config_t *cfg);
-
graph_def_t *graph_get_defs (graph_config_t *cfg);
int graph_add_def (graph_config_t *cfg, graph_def_t *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);
+
+/* Compares the given string with the appropriate field of the selector. If the
+ * selector field is "/all/" or "/any/", returns true without checking the
+ * instances. See "graph_inst_search_field" for finding all matching instances.
+ * */
+_Bool graph_matches_field (graph_config_t *cfg,
+ graph_ident_field_t field, const char *field_value);
int graph_inst_foreach (graph_config_t *cfg,
- inst_callback_t cb, void *user_data);
+ inst_callback_t cb, void *user_data);
+
+graph_instance_t *graph_inst_find_exact (graph_config_t *cfg,
+ graph_ident_t *ident);
+
+graph_instance_t *graph_inst_find_matching (graph_config_t *cfg,
+ const graph_ident_t *ident);
+
+int graph_inst_search (graph_config_t *cfg, const char *term,
+ graph_inst_callback_t callback, void *user_data);
-int graph_search (graph_config_t *cfg, const char *term,
+/* Iterates over all instances and calls "inst_matches_field". If that method
+ * returns true, calls the callback with the graph and instance pointers. */
+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);
int graph_compare (graph_config_t *cfg, const graph_ident_t *ident);