src/configfile.c: s/TypesDS/TypesDB/;

[collectd.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index 86ffbde..495e169 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;
@@ -437,7 +439,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);
@@ -494,15 +495,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 +528,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 +562,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;
@@ -592,7 +597,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 +630,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;