Implement "DEF" configuration.

[collection4.git] / graph_list.h

diff --git a/graph_list.h b/graph_list.h
index 40d35ea..89351a9 100644 (file)
--- a/graph_list.h
+++ b/graph_list.h
@@ -1,10 +1,9 @@
 #ifndef GRAPH_LIST_H
 #define GRAPH_LIST_H 1
 
-#include "utils_array.h"
-#include "graph_ident.h"
-#include "oconfig.h"
-
+/*
+ * Data types
+ */
 struct graph_instance_s;
 typedef struct graph_instance_s graph_instance_t;
 
@@ -20,6 +19,11 @@ typedef int (*gl_cfg_callback) (graph_config_t *cfg,
 typedef int (*gl_inst_callback) (graph_config_t *cfg,
     graph_instance_t *inst, void *user_data);
 
+#include "graph_def.h"
+#include "graph_ident.h"
+#include "utils_array.h"
+#include "oconfig.h"
+
 /*
  * Functions
  */
@@ -36,6 +40,8 @@ int gl_graph_get_title (graph_config_t *cfg,
 
 graph_ident_t *gl_graph_get_selector (graph_config_t *cfg);
 
+int gl_graph_add_def (graph_config_t *cfg, graph_def_t *def);
+
 int gl_graph_instance_get_all (graph_config_t *cfg,
     gl_inst_callback callback, void *user_data);
 
@@ -52,19 +58,6 @@ int gl_instance_get_rrdargs (graph_config_t *cfg, graph_instance_t *inst,
 
 graph_ident_t *gl_instance_get_selector (graph_instance_t *inst);
 
-struct graph_list_s
-{
-  char *host;
-  char *plugin;
-  char *plugin_instance;
-  char *type;
-  char *type_instance;
-};
-typedef struct graph_list_s graph_list_t;
-
-typedef int (*gl_callback) (
-    const graph_list_t *, void *user_data);
-
 int gl_update (void);
 
 #endif /* GRAPH_LIST_H */