X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgraph_instance.h;h=0279deb3da1781d49c860bb094f138b8db4b0782;hb=2ef734476e3511b6f1c2611875e340b6b8ca2d4c;hp=a6e7462163e5aae3dd47f6ca12bfbdd912816778;hpb=7d659a7188dd2012d9e7a90168750757b4ef97ba;p=collection4.git

diff --git a/src/graph_instance.h b/src/graph_instance.h
index a6e7462..0279deb 100644
--- a/src/graph_instance.h
+++ b/src/graph_instance.h
@@ -1,10 +1,37 @@
+/**
+ * collection4 - graph_instance.h
+ * 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>
+ **/
+
 #ifndef GRAPH_INSTANCE_H
 #define GRAPH_INSTANCE_H 1
 
 #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"
 
 /*
@@ -26,13 +53,21 @@ 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_compare (const graph_instance_t *i0, const graph_instance_t *i1);
+
 int inst_compare_ident (graph_instance_t *inst, const graph_ident_t *ident);
 
-_Bool inst_matches_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);
+
+/* 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);
 
 _Bool inst_matches_string (graph_config_t *cfg, graph_instance_t *inst,
     const char *term);
@@ -45,6 +80,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);