X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_instance.h;h=61d5ea43f67bc05dd187ac24030e12fd3cbd3715;hb=8a3753760230b270c8f4615891cba2586a661d21;hp=f1a44865d646db2dab1eb2267dba5050bc5eca63;hpb=2c85f876c1b9d5c161694cfb03cf20773b74c844;p=collection4.git

diff --git a/src/graph_instance.h b/src/graph_instance.h
index f1a4486..61d5ea4 100644
--- a/src/graph_instance.h
+++ b/src/graph_instance.h
@@ -4,6 +4,8 @@
 #include <time.h>
 
 #include "graph_types.h"
+#include "graph_ident.h"
+#include "rrd_args.h"
 #include "utils_array.h"
 
 /*
@@ -18,25 +20,37 @@ int inst_add_file (graph_instance_t *inst, const graph_ident_t *file);
 
 graph_instance_t *inst_get_selected (graph_config_t *cfg);
 
+int inst_get_all_selected (graph_config_t *cfg,
+    graph_inst_callback_t callback, void *user_data);
+
 int inst_get_params (graph_config_t *cfg, graph_instance_t *inst,
     char *buffer, size_t buffer_size);
 
 int inst_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
-    str_array_t *args);
+    rrd_args_t *args);
 
 graph_ident_t *inst_get_selector (graph_instance_t *inst);
 
-int inst_append (graph_instance_t *head, graph_instance_t *inst);
+int inst_compare_ident (graph_instance_t *inst, const graph_ident_t *ident);
+
+/* Returns true if "ident" matches the instance's selector. */
+_Bool inst_ident_matches (graph_instance_t *inst, const graph_ident_t *ident);
 
-int inst_foreach (graph_instance_t *inst,
-		inst_callback_t cb, void *user_data);
+/* Returns true if the instance's selector matches the (more general)
+ * "selector" ident. */
+_Bool inst_matches_ident (graph_instance_t *inst,
+    const graph_ident_t *selector);
 
-int inst_search (graph_config_t *cfg, graph_instance_t *inst,
-    const char *term, inst_callback_t cb,
-    void *user_data);
+_Bool inst_matches_string (graph_config_t *cfg, graph_instance_t *inst,
+    const char *term);
 
-graph_instance_t *inst_find_matching (graph_instance_t *inst,
-    const graph_ident_t *ident);
+/* Compares the given string with the appropriate field of the selector or, if
+ * the selector field is "/all/", iterates over all the files of the instance
+ * and checks the appropriate field. Returns true if the field of the selector
+ * or of one of the files matches. The string must match entirely but
+ * comparison is done case-insensitive. */
+_Bool inst_matches_field (graph_instance_t *inst,
+    graph_ident_field_t field, const char *field_value);
 
 int inst_describe (graph_config_t *cfg, graph_instance_t *inst,
     char *buffer, size_t buffer_size);