X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.h;h=e2de6fff05d7ee4ad76c48ea4a5b3aec5a62cf26;hb=430b0b4d0275f7fea64376fc166e81fc0bcc36bf;hp=318b54734a0cbe1777855b624c9dd87adacab492;hpb=c60c6dfa5960b23bdc59341ae73e701dd59d4305;p=collectd.git diff --git a/src/plugin.h b/src/plugin.h index 318b5473..e2de6fff 100644 --- a/src/plugin.h +++ b/src/plugin.h @@ -74,12 +74,13 @@ struct value_list_s char host[DATA_MAX_NAME_LEN]; char plugin[DATA_MAX_NAME_LEN]; char plugin_instance[DATA_MAX_NAME_LEN]; + char type[DATA_MAX_NAME_LEN]; char type_instance[DATA_MAX_NAME_LEN]; }; 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", "", "", "", "" } +#define VALUE_LIST_STATIC { NULL, 0, 0, 0, "localhost", "", "", "", "" } struct data_source_s { @@ -150,10 +151,11 @@ int plugin_load (const char *name); void plugin_init_all (void); void plugin_read_all (void); -void plugin_flush_all (int timeout); void plugin_shutdown_all (void); +void plugin_flush_all (int timeout); int plugin_flush_one (int timeout, const char *name); +int plugin_flush (const char *plugin, int timeout, const char *identifier); /* * The `plugin_register_*' functions are used to make `config', `init', @@ -172,7 +174,7 @@ int plugin_register_read (const char *name, int plugin_register_write (const char *name, int (*callback) (const data_set_t *ds, const value_list_t *vl)); int plugin_register_flush (const char *name, - int (*callback) (const int)); + int (*callback) (const int timeout, const char *identifier)); int plugin_register_shutdown (char *name, int (*callback) (void)); int plugin_register_data_set (const data_set_t *ds); @@ -204,11 +206,10 @@ int plugin_unregister_notification (const char *name); * write-functions. * * ARGUMENTS - * `name' Name/type of the data-set that describe the values in `vl'. * `vl' Value list of the values that have been read by a `read' * function. */ -int plugin_dispatch_values (const char *name, value_list_t *vl); +int plugin_dispatch_values (value_list_t *vl); int plugin_dispatch_notification (const notification_t *notif);