X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.c;h=6c7aa057cf2d272b126eadf6308a76188d3f3b1a;hb=26e01e52629e0894e34ad3deb6c9fc921d145443;hp=12f002cf5baba8d3a77b6285e63cca253e04d6a8;hpb=d189964960c406ddaff60e47b4ae01fcc38bec45;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 12f002cf..6c7aa057 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1217,6 +1217,27 @@ int plugin_register_shutdown (const char *name,
 				(void *) callback, /* user_data = */ NULL));
 } /* int plugin_register_shutdown */
 
+static void plugin_free_data_sets (void)
+{
+	void *key;
+	void *value;
+
+	if (data_sets == NULL)
+		return;
+
+	while (c_avl_pick (data_sets, &key, &value) == 0)
+	{
+		data_set_t *ds = value;
+		/* key is a pointer to ds->type */
+
+		sfree (ds->ds);
+		sfree (ds);
+	}
+
+	c_avl_destroy (data_sets);
+	data_sets = NULL;
+} /* void plugin_free_data_sets */
+
 int plugin_register_data_set (const data_set_t *ds)
 {
 	data_set_t *ds_copy;
@@ -1764,6 +1785,7 @@ void plugin_shutdown_all (void)
 	destroy_all_callbacks (&list_log);
 
 	plugin_free_loaded ();
+	plugin_free_data_sets ();
 } /* void plugin_shutdown_all */
 
 int plugin_dispatch_missing (const value_list_t *vl) /* {{{ */