src/plugin.c: Check `list_data_set' to be non-NULL before querying it.

[collectd.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index 86ffbde..7dd7bd9 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -186,6 +186,8 @@ static void *plugin_read_thread (void *args)
 
                        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)
@@ -266,7 +268,7 @@ static void stop_threads (void)
                {
                        ERROR ("plugin: stop_threads: pthread_join failed.");
                }
-               read_threads[i] = -1;
+               read_threads[i] = (pthread_t) 0;
        }
        sfree (read_threads);
        read_threads_num = 0;
@@ -415,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,
@@ -437,7 +465,6 @@ int plugin_unregister_init (const char *name)
 
 int plugin_unregister_read (const char *name)
 {
-       return (plugin_unregister (list_read, name));
        llentry_t *e;
 
        e = llist_search (list_read, name);
@@ -464,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)
 {
@@ -494,15 +539,16 @@ void plugin_init_all (void)
        le = llist_head (list_init);
        while (le != NULL)
        {
-               callback = le->value;
+               callback = (int (*) (void)) le->value;
                status = (*callback) ();
 
                if (status != 0)
                {
                        ERROR ("Initialization of plugin `%s' "
                                        "failed with status %i. "
-                                       "Plugin will be unloaded. TODO!",
+                                       "Plugin will be unloaded.",
                                        le->key, status);
+                       /* FIXME: Unload _all_ functions */
                        plugin_unregister_read (le->key);
                }
 
@@ -526,7 +572,10 @@ void plugin_read_all (const int *loop)
                rf = (read_func_t *) le->value;
 
                if (rf->needs_read != DONE)
+               {
+                       le = le->next;
                        continue;
+               }
 
                if (rf->wait_left > 0)
                        rf->wait_left -= interval_g;
@@ -557,7 +606,7 @@ void plugin_shutdown_all (void)
        le = llist_head (list_shutdown);
        while (le != NULL)
        {
-               callback = le->value;
+               callback = (int (*) (void)) le->value;
                (*callback) ();
 
                le = le->next;
@@ -570,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);
@@ -592,7 +641,7 @@ int plugin_dispatch_values (const char *name, const value_list_t *vl)
        le = llist_head (list_write);
        while (le != NULL)
        {
-               callback = le->value;
+               callback = (int (*) (const data_set_t *, const value_list_t *)) le->value;
                (*callback) (ds, vl);
 
                le = le->next;
@@ -625,7 +674,7 @@ void plugin_log (int level, const char *format, ...)
        le = llist_head (list_log);
        while (le != NULL)
        {
-               callback = le->value;
+               callback = (void (*) (int, const char *)) le->value;
                (*callback) (level, msg);
 
                le = le->next;