X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=blobdiff_plain;f=src%2Fplugin.c;h=2ad866e3bb2fbcb44012ff997b62932563bdd349;hp=894b0e51d72731ba1f7faab5c032a122063e85be;hb=10b92353ea2ccf66eabad273799c36225d2efc3f;hpb=38d06a8f868293466f4eee943555c65457a5e560

diff --git a/src/plugin.c b/src/plugin.c
index 894b0e51..2ad866e3 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1206,6 +1206,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;
@@ -1730,6 +1751,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) /* {{{ */