X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.c;h=5d882e64de7e69f47b47c53eeb7e63e4adea1045;hb=e21d0408e4e4001b8c66bb1ea7d41b890100d0f5;hp=70e0c0ffcf367e5f030e86a394fddf7e2d7c315c;hpb=2c4802dbdf90c721202fd87f8141ab079b085c56;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 70e0c0ff..5d882e64 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -888,6 +888,14 @@ int plugin_unregister_read (const char *name) /* {{{ */
 	}
 
 	le = llist_search (read_list, name);
+	if (le == NULL)
+	{
+		pthread_mutex_unlock (&read_lock);
+		WARNING ("plugin_unregister_read: No such read function: %s",
+				name);
+		return (-ENOENT);
+	}
+
 	llist_remove (read_list, le);
 
 	rf = le->value;
@@ -1205,8 +1213,14 @@ void plugin_shutdown_all (void)
 		(*callback) ();
 	}
 
-	destroy_all_callbacks (&list_write);
+	/* Write plugins which use the `user_data' pointer usually need the
+	 * same data available to the flush callback. If this is the case, set
+	 * the free_function to NULL when registering the flush callback and to
+	 * the real free function when registering the write callback. This way
+	 * the data isn't freed twice. */
 	destroy_all_callbacks (&list_flush);
+	destroy_all_callbacks (&list_write);
+
 	destroy_all_callbacks (&list_notification);
 	destroy_all_callbacks (&list_shutdown);
 	destroy_all_callbacks (&list_log);
@@ -1222,6 +1236,8 @@ int plugin_dispatch_values (value_list_t *vl)
 
 	data_set_t *ds;
 
+	int free_meta_data = 0;
+
 	if ((vl == NULL) || (vl->type[0] == 0)
 			|| (vl->values == NULL) || (vl->values_len < 1))
 	{
@@ -1229,6 +1245,12 @@ int plugin_dispatch_values (value_list_t *vl)
 		return (-1);
 	}
 
+	/* Free meta data only if the calling function didn't specify any. In
+	 * this case matches and targets may add some and the calling function
+	 * may not expect (and therefore free) that data. */
+	if (vl->meta == NULL)
+		free_meta_data = 1;
+
 	if (list_write == NULL)
 		c_complain_once (LOG_WARNING, &no_write_complaint,
 				"plugin_dispatch_values: No write callback has been "
@@ -1369,6 +1391,12 @@ int plugin_dispatch_values (value_list_t *vl)
 		vl->values_len = saved_values_len;
 	}
 
+	if ((free_meta_data != 0) && (vl->meta != NULL))
+	{
+		meta_data_destroy (vl->meta);
+		vl->meta = NULL;
+	}
+
 	return (0);
 } /* int plugin_dispatch_values */