disk plugin: Correct the collection of {read,write}-time.

[collectd.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index 495e169..7dd7bd9 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -417,7 +417,33 @@ int plugin_register_shutdown (char *name,
 
 int plugin_register_data_set (const data_set_t *ds)
 {
-       return (register_callback (&list_data_set, ds->type, (void *) ds));
+       data_set_t *ds_copy;
+       int i;
+
+       if ((list_data_set != NULL)
+                       && (llist_search (list_data_set, ds->type) != NULL))
+       {
+               NOTICE ("Replacing DS `%s' with another version.", ds->type);
+               plugin_unregister_data_set (ds->type);
+       }
+
+       ds_copy = (data_set_t *) malloc (sizeof (data_set_t));
+       if (ds_copy == NULL)
+               return (-1);
+       memcpy(ds_copy, ds, sizeof (data_set_t));
+
+       ds_copy->ds = (data_source_t *) malloc (sizeof (data_source_t)
+                       * ds->ds_num);
+       if (ds_copy->ds == NULL)
+       {
+               free (ds_copy);
+               return (-1);
+       }
+
+       for (i = 0; i < ds->ds_num; i++)
+               memcpy (ds_copy->ds + i, ds->ds + i, sizeof (data_source_t));
+
+       return (register_callback (&list_data_set, ds->type, (void *) ds_copy));
 } /* int plugin_register_data_set */
 
 int plugin_register_log (char *name,
@@ -465,8 +491,26 @@ int plugin_unregister_shutdown (const char *name)
 
 int plugin_unregister_data_set (const char *name)
 {
-       return (plugin_unregister (list_data_set, name));
-}
+       llentry_t  *e;
+       data_set_t *ds;
+
+       if (list_data_set == NULL)
+               return (-1);
+
+       e = llist_search (list_data_set, name);
+
+       if (e == NULL)
+               return (-1);
+
+       llist_remove (list_data_set, e);
+       ds = (data_set_t *) e->value;
+       llentry_destroy (e);
+
+       sfree (ds->ds);
+       sfree (ds);
+
+       return (0);
+} /* int plugin_unregister_data_set */
 
 int plugin_unregister_log (const char *name)
 {
@@ -575,7 +619,7 @@ int plugin_dispatch_values (const char *name, const value_list_t *vl)
        data_set_t *ds;
        llentry_t *le;
 
-       if (list_write == NULL)
+       if ((list_write == NULL) || (list_data_set == NULL))
                return (-1);
 
        le = llist_search (list_data_set, name);