"graph_def_json" action: Make this work with ad-hoc DEFs, too.

[collection4.git] / src / graph_instance.h

diff --git a/src/graph_instance.h b/src/graph_instance.h
index cca55dc..5685853 100644 (file)
--- a/src/graph_instance.h
+++ b/src/graph_instance.h
@@ -26,7 +26,10 @@
 
 #include <time.h>
 
+#include <yajl/yajl_gen.h>
+
 #include "graph_types.h"
+#include "data_provider.h"
 #include "graph_ident.h"
 #include "rrd_args.h"
 #include "utils_array.h"
@@ -52,8 +55,14 @@ int inst_get_params (graph_config_t *cfg, graph_instance_t *inst,
 int inst_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
     rrd_args_t *args);
 
+graph_def_t *inst_get_default_defs (graph_config_t *cfg,
+    graph_instance_t *inst);
+
+/* Returns a copy of the selector which must be freed by the caller. */
 graph_ident_t *inst_get_selector (graph_instance_t *inst);
 
+int inst_compare (const graph_instance_t *i0, const graph_instance_t *i1);
+
 int inst_compare_ident (graph_instance_t *inst, const graph_ident_t *ident);
 
 /* Returns true if "ident" matches the instance's selector. */
@@ -75,6 +84,11 @@ _Bool inst_matches_string (graph_config_t *cfg, graph_instance_t *inst,
 _Bool inst_matches_field (graph_instance_t *inst,
     graph_ident_field_t field, const char *field_value);
 
+int inst_to_json (const graph_instance_t *inst, yajl_gen handler);
+int inst_data_to_json (const graph_instance_t *inst,
+    dp_time_t begin, dp_time_t end,
+    yajl_gen handler);
+
 int inst_describe (graph_config_t *cfg, graph_instance_t *inst,
     char *buffer, size_t buffer_size);