X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.h;h=868f44aba41d81f46fd384de7805ffa92f1a09fe;hb=07be522384e753b7921213a0dc96a50336c79a66;hp=e58444ff40fd39a2f65eda384ddeea5a97a9574a;hpb=04b395325b152a5ddf424d1a750f455a2f8229fb;p=collectd.git

diff --git a/src/plugin.h b/src/plugin.h
index e58444ff..868f44ab 100644
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -24,11 +24,23 @@
 
 #include "collectd.h"
 #include "configfile.h"
+#include "meta_data.h"
+
+#define PLUGIN_FLAGS_GLOBAL 0x0001
 
 #define DATA_MAX_NAME_LEN 64
 
-#define DS_TYPE_COUNTER 0
-#define DS_TYPE_GAUGE   1
+#define DS_TYPE_COUNTER  0
+#define DS_TYPE_GAUGE    1
+#define DS_TYPE_DERIVE   2
+#define DS_TYPE_ABSOLUTE 3
+
+#define DS_TYPE_TO_STRING(t) (t == DS_TYPE_COUNTER)     ? "counter"  : \
+				(t == DS_TYPE_GAUGE)    ? "gauge"    : \
+				(t == DS_TYPE_DERIVE)   ? "derive"   : \
+				(t == DS_TYPE_ABSOLUTE) ? "absolute" : \
+				"unknown"
+
 
 #ifndef LOG_ERR
 # define LOG_ERR 3
@@ -57,11 +69,15 @@
  */
 typedef unsigned long long counter_t;
 typedef double gauge_t;
+typedef int64_t derive_t;
+typedef uint64_t absolute_t;
 
 union value_u
 {
-	counter_t counter;
-	gauge_t   gauge;
+	counter_t  counter;
+	gauge_t    gauge;
+	derive_t   derive;
+	absolute_t absolute;
 };
 typedef union value_u value_t;
 
@@ -76,11 +92,12 @@ struct value_list_s
 	char     plugin_instance[DATA_MAX_NAME_LEN];
 	char     type[DATA_MAX_NAME_LEN];
 	char     type_instance[DATA_MAX_NAME_LEN];
+	meta_data_t *meta;
 };
 typedef struct value_list_s value_list_t;
 
-#define VALUE_LIST_INIT { NULL, 0, 0, interval_g, "localhost", "", "", "", "" }
-#define VALUE_LIST_STATIC { NULL, 0, 0, 0, "localhost", "", "", "", "" }
+#define VALUE_LIST_INIT { NULL, 0, 0, interval_g, "localhost", "", "", "", "", NULL }
+#define VALUE_LIST_STATIC { NULL, 0, 0, 0, "localhost", "", "", "", "", NULL }
 
 struct data_source_s
 {
@@ -146,9 +163,17 @@ typedef struct user_data_s user_data_t;
 /*
  * Callback types
  */
+typedef int (*plugin_init_cb) (void);
 typedef int (*plugin_read_cb) (user_data_t *);
 typedef int (*plugin_write_cb) (const data_set_t *, const value_list_t *,
 		user_data_t *);
+typedef int (*plugin_flush_cb) (int timeout, const char *identifier,
+		user_data_t *);
+typedef void (*plugin_log_cb) (int severity, const char *message,
+		user_data_t *);
+typedef int (*plugin_shutdown_cb) (void);
+typedef int (*plugin_notification_cb) (const notification_t *,
+		user_data_t *);
 
 /*
  * NAME
@@ -177,7 +202,7 @@ void plugin_set_dir (const char *dir);
  *
  * ARGUMENTS
  *  `name'      Name of the plugin to load.
- *  `mr'        Types of functions to request from the plugin.
+ *  `flags'     Hints on how to handle this plugin.
  *
  * RETURN VALUE
  *  Returns zero upon success, a value greater than zero if no plugin was found
@@ -186,7 +211,7 @@ void plugin_set_dir (const char *dir);
  * NOTES
  *  No attempt is made to re-load an already loaded module.
  */
-int plugin_load (const char *name);
+int plugin_load (const char *name, uint32_t flags);
 
 void plugin_init_all (void);
 void plugin_read_all (void);
@@ -236,28 +261,29 @@ int plugin_register_config (const char *name,
 int plugin_register_complex_config (const char *type,
 		int (*callback) (oconfig_item_t *));
 int plugin_register_init (const char *name,
-		int (*callback) (void));
+		plugin_init_cb callback);
 int plugin_register_read (const char *name,
 		int (*callback) (void));
 int plugin_register_complex_read (const char *name,
-		plugin_read_cb callback, user_data_t *user_data);
+		plugin_read_cb callback,
+		const struct timespec *interval,
+		user_data_t *user_data);
 int plugin_register_write (const char *name,
 		plugin_write_cb callback, user_data_t *user_data);
 int plugin_register_flush (const char *name,
-		int (*callback) (const int timeout, const char *identifier));
+		plugin_flush_cb callback, user_data_t *user_data);
 int plugin_register_shutdown (char *name,
-		int (*callback) (void));
+		plugin_shutdown_cb callback);
 int plugin_register_data_set (const data_set_t *ds);
-int plugin_register_log (char *name,
-		void (*callback) (int, const char *));
+int plugin_register_log (const char *name,
+		plugin_log_cb callback, user_data_t *user_data);
 int plugin_register_notification (const char *name,
-		int (*callback) (const notification_t *notif));
+		plugin_notification_cb callback, user_data_t *user_data);
 
 int plugin_unregister_config (const char *name);
 int plugin_unregister_complex_config (const char *name);
 int plugin_unregister_init (const char *name);
 int plugin_unregister_read (const char *name);
-int plugin_unregister_complex_read (const char *name, void **user_data);
 int plugin_unregister_write (const char *name);
 int plugin_unregister_flush (const char *name);
 int plugin_unregister_shutdown (const char *name);