X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.c;h=d185ef2fb3d6c0be41e861ffe4baed6bb5f8de6e;hb=45aa6a65c24e38c0a3fa3880a300fbb02db50486;hp=6fd74e2b7d7c0a1edd737d27c2e4c45fa5c773d4;hpb=ba6497bdffb6a225eb6c86c8b8fa57a2520f0c5f;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 6fd74e2b..d185ef2f 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -41,22 +41,28 @@
 /*
  * Private structures
  */
-struct read_func_s
+struct callback_func_s
 {
-	int wait_time;
-	int wait_left;
-	int (*callback) (void);
-	enum { DONE = 0, TODO = 1, ACTIVE = 2 } needs_read;
+	void *cf_callback;
+	user_data_t cf_udata;
 };
-typedef struct read_func_s read_func_t;
+typedef struct callback_func_s callback_func_t;
 
-struct dispatch_queue_s;
-typedef struct dispatch_queue_s dispatch_queue_t;
-struct dispatch_queue_s
+#define RF_SIMPLE  0
+#define RF_COMPLEX 1
+struct read_func_s
 {
-	value_list_t *vl;
-	dispatch_queue_t *next;
+	/* `read_func_t' "inherits" from `callback_func_t'.
+	 * The `rf_super' member MUST be the first one in this structure! */
+#define rf_callback rf_super.cf_callback
+#define rf_udata rf_super.cf_udata
+	callback_func_t rf_super;
+	int rf_type;
+	int rf_wait_time;
+	int rf_wait_left;
+	enum { DONE = 0, TODO = 1, ACTIVE = 2 } rf_needs_read;
 };
+typedef struct read_func_s read_func_t;
 
 /*
  * Private variables
@@ -76,19 +82,11 @@ static c_avl_tree_t *data_sets;
 
 static char *plugindir = NULL;
 
-static int             read_loop = 0;
+static int             read_loop = 1;
 static pthread_mutex_t read_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t  read_cond = PTHREAD_COND_INITIALIZER;
 static pthread_t      *read_threads = NULL;
-static size_t          read_threads_num = 0;
-
-static int               dispatch_loop = 0;
-static pthread_mutex_t   dispatch_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t    dispatch_cond = PTHREAD_COND_INITIALIZER;
-static pthread_t        *dispatch_threads = NULL;
-static size_t            dispatch_threads_num = 0;
-static dispatch_queue_t *dispatch_head;
-static dispatch_queue_t *dispatch_tail;
+static int             read_threads_num = 0;
 
 /*
  * Static functions
@@ -101,26 +99,81 @@ static const char *plugin_get_dir (void)
 		return (plugindir);
 }
 
-static int register_callback (llist_t **list, const char *name, void *callback)
+static void destroy_callback (callback_func_t *cf) /* {{{ */
+{
+	if (cf == NULL)
+		return;
+
+	if ((cf->cf_udata.data != NULL) && (cf->cf_udata.free_func != NULL))
+	{
+		cf->cf_udata.free_func (cf->cf_udata.data);
+		cf->cf_udata.data = NULL;
+		cf->cf_udata.free_func = NULL;
+	}
+	sfree (cf);
+} /* }}} void destroy_callback */
+
+static void destroy_all_callbacks (llist_t **list) /* {{{ */
+{
+	llentry_t *le;
+
+	if (*list == NULL)
+		return;
+
+	le = llist_head (*list);
+	while (le != NULL)
+	{
+		llentry_t *le_next;
+
+		le_next = le->next;
+
+		sfree (le->key);
+		destroy_callback (le->value);
+		le->value = NULL;
+
+		le = le_next;
+	}
+
+	llist_destroy (*list);
+	*list = NULL;
+} /* }}} void destroy_all_callbacks */
+
+static int register_callback (llist_t **list, /* {{{ */
+		const char *name, callback_func_t *cf)
 {
 	llentry_t *le;
 	char *key;
 
-	if ((*list == NULL)
-			&& ((*list = llist_create ()) == NULL))
+	if (*list == NULL)
+	{
+		*list = llist_create ();
+		if (*list == NULL)
+		{
+			ERROR ("plugin: create_register_callback: "
+					"llist_create failed.");
+			destroy_callback (cf);
+			return (-1);
+		}
+	}
+
+	key = strdup (name);
+	if (key == NULL)
+	{
+		ERROR ("plugin: create_register_callback: strdup failed.");
+		destroy_callback (cf);
 		return (-1);
+	}
 
 	le = llist_search (*list, name);
 	if (le == NULL)
 	{
-		key = strdup (name);
-		if (key == NULL)
-			return (-1);
-
-		le = llentry_create (key, callback);
+		le = llentry_create (key, cf);
 		if (le == NULL)
 		{
+			ERROR ("plugin: create_register_callback: "
+					"llentry_create failed.");
 			free (key);
+			destroy_callback (cf);
 			return (-1);
 		}
 
@@ -128,27 +181,67 @@ static int register_callback (llist_t **list, const char *name, void *callback)
 	}
 	else
 	{
-		le->value = callback;
+		callback_func_t *old_cf;
+
+		old_cf = le->value;
+		le->value = cf;
+
+		destroy_callback (old_cf);
+		sfree (key);
 	}
 
 	return (0);
-} /* int register_callback */
+} /* }}} int register_callback */
+
+static int create_register_callback (llist_t **list, /* {{{ */
+		const char *name, void *callback, user_data_t *ud)
+{
+	char *key;
+	callback_func_t *cf;
+
+	cf = (callback_func_t *) malloc (sizeof (*cf));
+	if (cf == NULL)
+	{
+		ERROR ("plugin: create_register_callback: malloc failed.");
+		sfree (key);
+		return (-1);
+	}
+	memset (cf, 0, sizeof (*cf));
+
+	cf->cf_callback = callback;
+	if (ud == NULL)
+	{
+		cf->cf_udata.data = NULL;
+		cf->cf_udata.free_func = NULL;
+	}
+	else
+	{
+		cf->cf_udata = *ud;
+	}
 
-static int plugin_unregister (llist_t *list, const char *name)
+	return (register_callback (list, name, cf));
+} /* }}} int create_register_callback */
+
+static int plugin_unregister (llist_t *list, const char *name) /* {{{ */
 {
 	llentry_t *e;
 
-	e = llist_search (list, name);
+	if (list == NULL)
+		return (-1);
 
+	e = llist_search (list, name);
 	if (e == NULL)
 		return (-1);
 
 	llist_remove (list, e);
-	free (e->key);
+
+	sfree (e->key);
+	destroy_callback (e->value);
+
 	llentry_destroy (e);
 
 	return (0);
-} /* int plugin_unregister */
+} /* }}} int plugin_unregister */
 
 /*
  * (Try to) load the shared object `file'. Won't complain if it isn't a shared
@@ -205,44 +298,58 @@ static void *plugin_read_thread (void __attribute__((unused)) *args)
 		{
 			rf = (read_func_t *) le->value;
 
-			if (rf->needs_read != TODO)
+			if (rf->rf_needs_read != TODO)
 			{
 				le = le->next;
 				continue;
 			}
 
 			/* We will do this read function */
-			rf->needs_read = ACTIVE;
+			rf->rf_needs_read = ACTIVE;
 
 			DEBUG ("[thread #%5lu] plugin: plugin_read_thread: Handling %s",
 					(unsigned long int) pthread_self (), le->key);
 			pthread_mutex_unlock (&read_lock);
 
-			status = rf->callback ();
+			if (rf->rf_type == RF_SIMPLE)
+			{
+				int (*callback) (void);
+
+				callback = rf->rf_callback;
+				status = (*callback) ();
+			}
+			else
+			{
+				plugin_read_cb callback;
+
+				callback = rf->rf_callback;
+				status = (*callback) (&rf->rf_udata);
+			}
+
 			done++;
 
 			if (status != 0)
 			{
-				if (rf->wait_time < interval_g)
-					rf->wait_time = interval_g;
-				rf->wait_left = rf->wait_time;
-				rf->wait_time = rf->wait_time * 2;
-				if (rf->wait_time > 86400)
-					rf->wait_time = 86400;
+				if (rf->rf_wait_time < interval_g)
+					rf->rf_wait_time = interval_g;
+				rf->rf_wait_left = rf->rf_wait_time;
+				rf->rf_wait_time = rf->rf_wait_time * 2;
+				if (rf->rf_wait_time > 86400)
+					rf->rf_wait_time = 86400;
 
 				NOTICE ("read-function of plugin `%s' "
 						"failed. Will suspend it for %i "
-						"seconds.", le->key, rf->wait_left);
+						"seconds.", le->key, rf->rf_wait_left);
 			}
 			else
 			{
-				rf->wait_left = 0;
-				rf->wait_time = interval_g;
+				rf->rf_wait_left = 0;
+				rf->rf_wait_time = interval_g;
 			}
 
 			pthread_mutex_lock (&read_lock);
 
-			rf->needs_read = DONE;
+			rf->rf_needs_read = DONE;
 			le = le->next;
 		} /* while (le != NULL) */
 
@@ -260,138 +367,60 @@ static void *plugin_read_thread (void __attribute__((unused)) *args)
 	return ((void *) 0);
 } /* void *plugin_read_thread */
 
-static void *plugin_dispatch_thread (void *arg)
-{
-	pthread_mutex_lock (&dispatch_lock);
-
-	while ((dispatch_loop != 0) || (dispatch_head != NULL))
-	{
-		dispatch_queue_t *qi;
-
-		if (dispatch_head == NULL)
-			pthread_cond_wait (&dispatch_cond, &dispatch_lock);
-
-		if (dispatch_head == NULL)
-			continue;
-
-		qi = dispatch_head;
-
-		if (dispatch_head == dispatch_tail)
-		{
-			dispatch_head = NULL;
-			dispatch_tail = NULL;
-		}
-		else
-		{
-			dispatch_head = qi->next;
-		}
-
-		pthread_mutex_unlock (&dispatch_lock);
-
-		plugin_dispatch_values (qi->vl);
-		sfree (qi->vl->values);
-		sfree (qi->vl);
-		sfree (qi);
-
-		pthread_mutex_lock (&dispatch_lock);
-	} /* while */
-
-	pthread_mutex_unlock (&dispatch_lock);
-
-	return ((void *) 0);
-} /* void *plugin_dispatch_thread */
-
-static int plugin_start_threads (size_t num,
-		pthread_t **tlist, size_t *tlist_num,
-		void *(*thread_main) (void *))
+static void start_read_threads (int num)
 {
-	size_t i;
-	pthread_t *new_tlist;
-	size_t new_tlist_num;
+	int i;
 
-	if (*tlist != NULL)
-		return (-1);
+	if (read_threads != NULL)
+		return;
 
-	new_tlist = (pthread_t *) calloc (num, sizeof (*new_tlist));
-	if (new_tlist == NULL)
+	read_threads = (pthread_t *) calloc (num, sizeof (pthread_t));
+	if (read_threads == NULL)
 	{
-		ERROR ("plugin: plugin_start_threads: calloc failed.");
-		return (-1);
+		ERROR ("plugin: start_read_threads: calloc failed.");
+		return;
 	}
 
-	new_tlist_num = 0;
+	read_threads_num = 0;
 	for (i = 0; i < num; i++)
 	{
-		int status;
-
-		status = pthread_create (new_tlist + new_tlist_num,
-				/* attr = */ NULL, thread_main,
-				/* arg = */ (void *) 0);
-		if (status != 0)
+		if (pthread_create (read_threads + read_threads_num, NULL,
+					plugin_read_thread, NULL) == 0)
 		{
-			ERROR ("plugin: plugin_start_threads: "
-					"pthread_create failed.");
-			continue;
+			read_threads_num++;
+		}
+		else
+		{
+			ERROR ("plugin: start_read_threads: pthread_create failed.");
+			return;
 		}
-
-		new_tlist_num++;
 	} /* for (i) */
+} /* void start_read_threads */
 
-	if (new_tlist_num < 1)
-	{
-		ERROR ("plugin: plugin_start_threads: "
-				"Creating threads failed.");
-		sfree (new_tlist);
-		return (-1);
-	}
-
-	*tlist     = new_tlist;
-	*tlist_num = new_tlist_num;
-
-	return (0);
-} /* int plugin_start_threads */
-
-static int plugin_stop_threads (int *loop,
-		pthread_mutex_t *lock, pthread_cond_t *cond,
-		pthread_t **ret_tlist, size_t *ret_tlist_len)
+static void stop_read_threads (void)
 {
-	pthread_t *tlist;
-	size_t tlist_len;
-	size_t i;
-
-	tlist     = *ret_tlist;
-	tlist_len = *ret_tlist_len;
-
-	if (tlist == NULL)
-		return (0);
-
-	DEBUG ("plugin_stop_threads: Stopping %zu threads.", tlist_len);
-
-	pthread_mutex_lock (lock);
+	int i;
 
-	*loop = 0;
+	if (read_threads == NULL)
+		return;
 
-	pthread_cond_broadcast (cond);
-	pthread_mutex_unlock (lock);
+	pthread_mutex_lock (&read_lock);
+	read_loop = 0;
+	DEBUG ("plugin: stop_read_threads: Signalling `read_cond'");
+	pthread_cond_broadcast (&read_cond);
+	pthread_mutex_unlock (&read_lock);
 
-	for (i = 0; i < tlist_len; i++)
+	for (i = 0; i < read_threads_num; i++)
 	{
-		int status;
-
-		status = pthread_join (tlist[i], NULL);
-		if (status != 0)
+		if (pthread_join (read_threads[i], NULL) != 0)
 		{
-			ERROR ("plugin_stop_threads: pthread_join failed.");
+			ERROR ("plugin: stop_read_threads: pthread_join failed.");
 		}
+		read_threads[i] = (pthread_t) 0;
 	}
-
-	sfree (tlist);
-
-	*ret_tlist = NULL;
-	*ret_tlist_len = 0;
-
-	return (0);
-} /* int plugin_stop_threads */
+	sfree (read_threads);
+	read_threads_num = 0;
+} /* void stop_read_threads */
 
 /*
  * Public functions
@@ -513,7 +542,8 @@ int plugin_register_complex_config (const char *type,
 int plugin_register_init (const char *name,
 		int (*callback) (void))
 {
-	return (register_callback (&list_init, name, (void *) callback));
+	return (create_register_callback (&list_init, name, (void *) callback,
+				/* user_data = */ NULL));
 } /* plugin_register_init */
 
 int plugin_register_read (const char *name,
@@ -530,31 +560,70 @@ int plugin_register_read (const char *name,
 		return (-1);
 	}
 
-	memset (rf, '\0', sizeof (read_func_t));
-	rf->wait_time = interval_g;
-	rf->wait_left = 0;
-	rf->callback = callback;
-	rf->needs_read = DONE;
+	memset (rf, 0, sizeof (read_func_t));
+	rf->rf_callback = (void *) callback;
+	rf->rf_udata.data = NULL;
+	rf->rf_udata.free_func = NULL;
+	rf->rf_wait_time = interval_g;
+	rf->rf_wait_left = 0;
+	rf->rf_type = RF_SIMPLE;
+	rf->rf_needs_read = DONE;
 
-	return (register_callback (&list_read, name, (void *) rf));
+	return (register_callback (&list_read, name, (callback_func_t *) rf));
 } /* int plugin_register_read */
 
+int plugin_register_complex_read (const char *name,
+		plugin_read_cb callback, user_data_t *user_data)
+{
+	read_func_t *rf;
+
+	rf = (read_func_t *) malloc (sizeof (read_func_t));
+	if (rf == NULL)
+	{
+		ERROR ("plugin_register_complex_read: malloc failed.");
+		return (-1);
+	}
+
+	memset (rf, 0, sizeof (read_func_t));
+	rf->rf_callback = (void *) callback;
+	rf->rf_wait_time = interval_g;
+	rf->rf_wait_left = 0;
+	rf->rf_type = RF_COMPLEX;
+	rf->rf_needs_read = DONE;
+
+	/* Set user data */
+	if (user_data == NULL)
+	{
+		rf->rf_udata.data = NULL;
+		rf->rf_udata.free_func = NULL;
+	}
+	else
+	{
+		rf->rf_udata = *user_data;
+	}
+
+	return (register_callback (&list_read, name, (callback_func_t *) rf));
+} /* int plugin_register_complex_read */
+
 int plugin_register_write (const char *name,
-		int (*callback) (const data_set_t *ds, const value_list_t *vl))
+		plugin_write_cb callback, user_data_t *ud)
 {
-	return (register_callback (&list_write, name, (void *) callback));
+	return (create_register_callback (&list_write, name,
+				(void *) callback, ud));
 } /* int plugin_register_write */
 
 int plugin_register_flush (const char *name,
-		int (*callback) (const int timeout, const char *identifier))
+		plugin_flush_cb callback, user_data_t *ud)
 {
-	return (register_callback (&list_flush, name, (void *) callback));
+	return (create_register_callback (&list_flush, name,
+				(void *) callback, ud));
 } /* int plugin_register_flush */
 
 int plugin_register_shutdown (char *name,
 		int (*callback) (void))
 {
-	return (register_callback (&list_shutdown, name, (void *) callback));
+	return (create_register_callback (&list_shutdown, name,
+				(void *) callback, /* user_data = */ NULL));
 } /* int plugin_register_shutdown */
 
 int plugin_register_data_set (const data_set_t *ds)
@@ -594,16 +663,18 @@ int plugin_register_data_set (const data_set_t *ds)
 	return (c_avl_insert (data_sets, (void *) ds_copy->type, (void *) ds_copy));
 } /* int plugin_register_data_set */
 
-int plugin_register_log (char *name,
-		void (*callback) (int priority, const char *msg))
+int plugin_register_log (const char *name,
+		plugin_log_cb callback, user_data_t *ud)
 {
-	return (register_callback (&list_log, name, (void *) callback));
+	return (create_register_callback (&list_log, name,
+				(void *) callback, ud));
 } /* int plugin_register_log */
 
 int plugin_register_notification (const char *name,
-		int (*callback) (const notification_t *notif))
+		plugin_notification_cb callback, user_data_t *ud)
 {
-	return (register_callback (&list_notification, name, (void *) callback));
+	return (create_register_callback (&list_notification, name,
+				(void *) callback, ud));
 } /* int plugin_register_log */
 
 int plugin_unregister_config (const char *name)
@@ -625,19 +696,7 @@ int plugin_unregister_init (const char *name)
 
 int plugin_unregister_read (const char *name)
 {
-	llentry_t *e;
-
-	e = llist_search (list_read, name);
-
-	if (e == NULL)
-		return (-1);
-
-	llist_remove (list_read, e);
-	free (e->value);
-	free (e->key);
-	llentry_destroy (e);
-
-	return (0);
+	return (plugin_unregister (list_read, name));
 }
 
 int plugin_unregister_write (const char *name)
@@ -684,7 +743,6 @@ int plugin_unregister_notification (const char *name)
 void plugin_init_all (void)
 {
 	const char *chain_name;
-	int (*callback) (void);
 	llentry_t *le;
 	int status;
 
@@ -707,7 +765,11 @@ void plugin_init_all (void)
 	le = llist_head (list_init);
 	while (le != NULL)
 	{
-		callback = (int (*) (void)) le->value;
+		callback_func_t *cf;
+		plugin_init_cb callback;
+
+		cf = le->value;
+		callback = cf->cf_callback;
 		status = (*callback) ();
 
 		if (status != 0)
@@ -734,18 +796,8 @@ void plugin_init_all (void)
 		rt = global_option_get ("ReadThreads");
 		num = atoi (rt);
 		if (num != -1)
-		{
-			read_loop = 1;
-			plugin_start_threads ((num > 0) ? ((size_t ) num) : 5,
-					&read_threads, &read_threads_num,
-					plugin_read_thread);
-		}
+			start_read_threads ((num > 0) ? num : 5);
 	}
-
-	dispatch_loop = 1;
-	plugin_start_threads (/* num = */ 1, /* FIXME: Make this number configurable */
-			&dispatch_threads, &dispatch_threads_num,
-			plugin_dispatch_thread);
 } /* void plugin_init_all */
 
 void plugin_read_all (void)
@@ -765,18 +817,18 @@ void plugin_read_all (void)
 	{
 		rf = (read_func_t *) le->value;
 
-		if (rf->needs_read != DONE)
+		if (rf->rf_needs_read != DONE)
 		{
 			le = le->next;
 			continue;
 		}
 
-		if (rf->wait_left > 0)
-			rf->wait_left -= interval_g;
+		if (rf->rf_wait_left > 0)
+			rf->rf_wait_left -= interval_g;
 
-		if (rf->wait_left <= 0)
+		if (rf->rf_wait_left <= 0)
 		{
-			rf->needs_read = TODO;
+			rf->rf_needs_read = TODO;
 		}
 
 		le = le->next;
@@ -806,7 +858,22 @@ int plugin_read_all_once (void)
 	     le = le->next)
 	{
 		rf = (read_func_t *) le->value;
-		status = rf->callback ();
+
+		if (rf->rf_type == RF_SIMPLE)
+		{
+			int (*callback) (void);
+
+			callback = rf->rf_callback;
+			status = (*callback) ();
+		}
+		else
+		{
+			plugin_read_cb callback;
+
+			callback = rf->rf_callback;
+			status = (*callback) (&rf->rf_udata);
+		}
+
 		if (status != 0)
 		{
 			NOTICE ("read-function of plugin `%s' failed.",
@@ -821,7 +888,6 @@ int plugin_read_all_once (void)
 int plugin_write (const char *plugin, /* {{{ */
 		const data_set_t *ds, const value_list_t *vl)
 {
-  int (*callback) (const data_set_t *ds, const value_list_t *vl);
   llentry_t *le;
   int status;
 
@@ -849,8 +915,12 @@ int plugin_write (const char *plugin, /* {{{ */
     le = llist_head (list_write);
     while (le != NULL)
     {
-      callback = le->value;
-      status = (*callback) (ds, vl);
+      callback_func_t *cf = le->value;
+      plugin_write_cb callback;
+
+      DEBUG ("plugin: plugin_write: Writing values via %s.", le->key);
+      callback = cf->cf_callback;
+      status = (*callback) (ds, vl, &cf->cf_udata);
       if (status != 0)
         failure++;
       else
@@ -866,6 +936,9 @@ int plugin_write (const char *plugin, /* {{{ */
   }
   else /* plugin != NULL */
   {
+    callback_func_t *cf;
+    plugin_write_cb callback;
+
     le = llist_head (list_write);
     while (le != NULL)
     {
@@ -878,8 +951,11 @@ int plugin_write (const char *plugin, /* {{{ */
     if (le == NULL)
       return (ENOENT);
 
-    callback = le->value;
-    status = (*callback) (ds, vl);
+    cf = le->value;
+
+    DEBUG ("plugin: plugin_write: Writing values via %s.", le->key);
+    callback = cf->cf_callback;
+    status = (*callback) (ds, vl, &cf->cf_udata);
   }
 
   return (status);
@@ -887,7 +963,6 @@ int plugin_write (const char *plugin, /* {{{ */
 
 int plugin_flush (const char *plugin, int timeout, const char *identifier)
 {
-  int (*callback) (int timeout, const char *identifier);
   llentry_t *le;
 
   if (list_flush == NULL)
@@ -896,6 +971,9 @@ int plugin_flush (const char *plugin, int timeout, const char *identifier)
   le = llist_head (list_flush);
   while (le != NULL)
   {
+    callback_func_t *cf;
+    plugin_flush_cb callback;
+
     if ((plugin != NULL)
         && (strcmp (plugin, le->key) != 0))
     {
@@ -903,8 +981,10 @@ int plugin_flush (const char *plugin, int timeout, const char *identifier)
       continue;
     }
 
-    callback = (int (*) (int, const char *)) le->value;
-    (*callback) (timeout, identifier);
+    cf = le->value;
+    callback = cf->cf_callback;
+
+    (*callback) (timeout, identifier, &cf->cf_udata);
 
     le = le->next;
   }
@@ -913,22 +993,27 @@ int plugin_flush (const char *plugin, int timeout, const char *identifier)
 
 void plugin_shutdown_all (void)
 {
-	int (*callback) (void);
 	llentry_t *le;
 
-	plugin_stop_threads (&read_loop, &read_lock, &read_cond,
-			&read_threads, &read_threads_num);
+	stop_read_threads ();
 
-	plugin_stop_threads (&dispatch_loop, &dispatch_lock, &dispatch_cond,
-			&dispatch_threads, &dispatch_threads_num);
+	destroy_all_callbacks (&list_init);
+	destroy_all_callbacks (&list_read);
 
-	if (list_shutdown == NULL)
-		return;
+	plugin_flush (/* plugin = */ NULL, /* timeout = */ -1,
+			/* identifier = */ NULL);
+
+	le = NULL;
+	if (list_shutdown != NULL)
+		le = llist_head (list_shutdown);
 
-	le = llist_head (list_shutdown);
 	while (le != NULL)
 	{
-		callback = (int (*) (void)) le->value;
+		callback_func_t *cf;
+		plugin_shutdown_cb callback;
+
+		cf = le->value;
+		callback = cf->cf_callback;
 
 		/* Advance the pointer before calling the callback allows
 		 * shutdown functions to unregister themselves. If done the
@@ -938,6 +1023,12 @@ void plugin_shutdown_all (void)
 
 		(*callback) ();
 	}
+
+	destroy_all_callbacks (&list_write);
+	destroy_all_callbacks (&list_flush);
+	destroy_all_callbacks (&list_notification);
+	destroy_all_callbacks (&list_shutdown);
+	destroy_all_callbacks (&list_log);
 } /* void plugin_shutdown_all */
 
 int plugin_dispatch_values (value_list_t *vl)
@@ -945,9 +1036,14 @@ int plugin_dispatch_values (value_list_t *vl)
 	int status;
 	static c_complain_t no_write_complaint = C_COMPLAIN_INIT_STATIC;
 
+	value_t *saved_values;
+	int      saved_values_len;
+
 	data_set_t *ds;
 
-	if ((vl == NULL) || (*vl->type == '\0')) {
+	if ((vl == NULL) || (vl->type[0] == 0)
+			|| (vl->values == NULL) || (vl->values_len < 1))
+	{
 		ERROR ("plugin_dispatch_values: Invalid value list.");
 		return (-1);
 	}
@@ -1011,6 +1107,31 @@ int plugin_dispatch_values (value_list_t *vl)
 	escape_slashes (vl->type, sizeof (vl->type));
 	escape_slashes (vl->type_instance, sizeof (vl->type_instance));
 
+	/* Copy the values. This way, we can assure `targets' that they get
+	 * dynamically allocated values, which they can free and replace if
+	 * they like. */
+	if ((pre_cache_chain != NULL) || (post_cache_chain != NULL))
+	{
+		saved_values     = vl->values;
+		saved_values_len = vl->values_len;
+
+		vl->values = (value_t *) calloc (vl->values_len,
+				sizeof (*vl->values));
+		if (vl->values == NULL)
+		{
+			ERROR ("plugin_dispatch_values: calloc failed.");
+			vl->values = saved_values;
+			return (-1);
+		}
+		memcpy (vl->values, saved_values,
+				vl->values_len * sizeof (*vl->values));
+	}
+	else /* if ((pre == NULL) && (post == NULL)) */
+	{
+		saved_values     = NULL;
+		saved_values_len = 0;
+	}
+
 	if (pre_cache_chain != NULL)
 	{
 		status = fc_process_chain (ds, vl, pre_cache_chain);
@@ -1022,7 +1143,17 @@ int plugin_dispatch_values (value_list_t *vl)
 					status, status);
 		}
 		else if (status == FC_TARGET_STOP)
+		{
+			/* Restore the state of the value_list so that plugins
+			 * don't get confused.. */
+			if (saved_values != NULL)
+			{
+				free (vl->values);
+				vl->values     = saved_values;
+				vl->values_len = saved_values_len;
+			}
 			return (0);
+		}
 	}
 
 	/* Update the value cache */
@@ -1042,82 +1173,20 @@ int plugin_dispatch_values (value_list_t *vl)
 	else
 		fc_default_action (ds, vl);
 
-	return (0);
-} /* int plugin_dispatch_values */
-
-int plugin_dispatch_values_async (const value_list_t *vl)
-{
-	dispatch_queue_t *qi;
-	int i;
-
-	if (vl == NULL)
-		return (-EINVAL);
-
-	if (dispatch_threads_num < 1)
+	/* Restore the state of the value_list so that plugins don't get
+	 * confused.. */
+	if (saved_values != NULL)
 	{
-		ERROR ("plugin_dispatch_values_async: "
-				"No dispatch threads have been started!");
-#ifdef ENOTCONN
-		return (-ENOTCONN);
-#else
-		return (-1);
-#endif
+		free (vl->values);
+		vl->values     = saved_values;
+		vl->values_len = saved_values_len;
 	}
 
-	qi = (dispatch_queue_t *) malloc (sizeof (*qi));
-	if (qi == NULL)
-	{
-		ERROR ("plugin_dispatch_values_async: malloc failed.");
-		return (-ENOMEM);
-	}
-	memset (qi, 0, sizeof (*qi));
-	qi->next = NULL;
-
-	qi->vl = (value_list_t *) malloc (sizeof (value_list_t));
-	if (qi->vl == NULL)
-	{
-		ERROR ("plugin_dispatch_values_async: malloc failed.");
-		sfree (qi);
-		return (-ENOMEM);
-	}
-	memcpy (qi->vl, vl, sizeof (value_list_t));
-	qi->vl->values = NULL;
-
-	qi->vl->values = (value_t *) calloc (qi->vl->values_len,
-			sizeof (value_t));
-	if (qi->vl->values == NULL)
-	{
-		ERROR ("plugin_dispatch_values_async: malloc failed.");
-		sfree (qi->vl);
-		sfree (qi);
-		return (-ENOMEM);
-	}
-
-	for (i = 0; i < vl->values_len; i++)
-		qi->vl->values[i] = vl->values[i];
-
-	pthread_mutex_lock (&dispatch_lock);
-
-	if (dispatch_tail == NULL)
-	{
-		dispatch_head = qi;
-		dispatch_tail = qi;
-	}
-	else
-	{
-		dispatch_tail->next = qi;
-		dispatch_tail = qi;
-	}
-
-	pthread_cond_signal (&dispatch_cond);
-	pthread_mutex_unlock (&dispatch_lock);
-
 	return (0);
-} /* int plugin_dispatch_values_async */
+} /* int plugin_dispatch_values */
 
 int plugin_dispatch_notification (const notification_t *notif)
 {
-	int (*callback) (const notification_t *);
 	llentry_t *le;
 	/* Possible TODO: Add flap detection here */
 
@@ -1133,8 +1202,19 @@ int plugin_dispatch_notification (const notification_t *notif)
 	le = llist_head (list_notification);
 	while (le != NULL)
 	{
-		callback = (int (*) (const notification_t *)) le->value;
-		(*callback) (notif);
+		callback_func_t *cf;
+		plugin_notification_cb callback;
+		int status;
+
+		cf = le->value;
+		callback = cf->cf_callback;
+		status = (*callback) (notif, &cf->cf_udata);
+		if (status != 0)
+		{
+			WARNING ("plugin_dispatch_notification: Notification "
+					"callback %s returned %i.",
+					le->key, status);
+		}
 
 		le = le->next;
 	}
@@ -1146,8 +1226,6 @@ void plugin_log (int level, const char *format, ...)
 {
 	char msg[1024];
 	va_list ap;
-
-	void (*callback) (int, const char *);
 	llentry_t *le;
 
 	if (list_log == NULL)
@@ -1166,8 +1244,13 @@ void plugin_log (int level, const char *format, ...)
 	le = llist_head (list_log);
 	while (le != NULL)
 	{
-		callback = (void (*) (int, const char *)) le->value;
-		(*callback) (level, msg);
+		callback_func_t *cf;
+		plugin_log_cb callback;
+
+		cf = le->value;
+		callback = cf->cf_callback;
+
+		(*callback) (level, msg, &cf->cf_udata);
 
 		le = le->next;
 	}
@@ -1360,3 +1443,5 @@ int plugin_notification_meta_free (notification_meta_t *n)
 
   return (0);
 } /* int plugin_notification_meta_free */
+
+/* vim: set sw=8 ts=8 noet fdm=marker : */