src/plugin.c: Implemented delaying of read-functions that fail.

[collectd.git] / src / unixsock.c

diff --git a/src/unixsock.c b/src/unixsock.c
index 21c9cc6..de1fa4f 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -98,6 +98,7 @@ static value_cache_t *cache_search (const char *name)
 } /* value_cache_t *cache_search */
 
 static int cache_alloc_name (char *ret, int ret_len,
+               const char *hostname,
                const char *plugin, const char *plugin_instance,
                const char *type, const char *type_instance)
 {
@@ -109,21 +110,20 @@ static int cache_alloc_name (char *ret, int ret_len,
        if ((plugin_instance == NULL) || (strlen (plugin_instance) == 0))
        {
                if ((type_instance == NULL) || (strlen (type_instance) == 0))
-                       status = snprintf (ret, ret_len, "%s/%s",
-                                       plugin, type);
+                       status = snprintf (ret, ret_len, "%s/%s/%s",
+                                       hostname, plugin, type);
                else
-                       status = snprintf (ret, ret_len, "%s/%s-%s",
-                                       plugin, type, type_instance);
+                       status = snprintf (ret, ret_len, "%s/%s/%s-%s",
+                                       hostname, plugin, type, type_instance);
        }
        else
        {
                if ((type_instance == NULL) || (strlen (type_instance) == 0))
-                       status = snprintf (ret, ret_len, "%s-%s/%s",
-                                       plugin, plugin_instance, type);
+                       status = snprintf (ret, ret_len, "%s/%s-%s/%s",
+                                       hostname, plugin, plugin_instance, type);
                else
-                       status = snprintf (ret, ret_len, "%s-%s/%s-%s",
-                                       plugin, plugin_instance,
-                                       type, type_instance);
+                       status = snprintf (ret, ret_len, "%s/%s-%s/%s-%s",
+                                       hostname, plugin, plugin_instance, type, type_instance);
        }
 
        if ((status < 1) || (status >= ret_len))
@@ -172,7 +172,7 @@ static int cache_insert (const data_set_t *ds, const value_list_t *vl)
        }
 
        if (cache_alloc_name (vc->name, sizeof (vc->name),
-                               vl->plugin, vl->plugin_instance,
+                               vl->host, vl->plugin, vl->plugin_instance,
                                ds->type, vl->type_instance) != 0)
        {
                pthread_mutex_unlock (&cache_lock);
@@ -222,6 +222,7 @@ static int cache_update (const data_set_t *ds, const value_list_t *vl)
        int i;
 
        if (cache_alloc_name (name, sizeof (name),
+                               vl->host,
                                vl->plugin, vl->plugin_instance,
                                ds->type, vl->type_instance) != 0)
                return (-1);
@@ -263,20 +264,12 @@ static int cache_update (const data_set_t *ds, const value_list_t *vl)
                                        / (vl->time - vc->time);
                        }
 
-                       DBG ("name = %s; old counter: %llu; new counter: %llu; rate: %lf;",
-                                       name,
-                                       vc->counter[i], vl->values[i].counter,
-                                       vc->gauge[i]);
-
                        vc->counter[i] = vl->values[i].counter;
                }
                else if (ds->ds[i].type == DS_TYPE_GAUGE)
                {
                        vc->gauge[i] = vl->values[i].gauge;
                        vc->counter[i] = 0;
-
-                       DBG ("name, %s; gauge: %lf;",
-                                       name, vc->gauge[i]);
                }
                else
                {
@@ -425,7 +418,8 @@ static int us_open_socket (void)
 
 static int us_handle_getval (FILE *fh, char **fields, int fields_num)
 {
-       char *plugin = fields[1];
+       char *hostname = fields[1];
+       char *plugin;
        char *plugin_instance;
        char *type;
        char *type_instance;
@@ -437,6 +431,11 @@ static int us_handle_getval (FILE *fh, char **fields, int fields_num)
        if (fields_num != 2)
                return (-1);
 
+       plugin = strchr (hostname, '/');
+       if (plugin == NULL)
+               return (-1);
+       *plugin = '\0'; plugin++;
+
        type = strchr (plugin, '/');
        if (type == NULL)
                return (-1);
@@ -457,7 +456,7 @@ static int us_handle_getval (FILE *fh, char **fields, int fields_num)
        }
 
        status = cache_alloc_name (name, sizeof (name),
-                       plugin, plugin_instance, type, type_instance);
+                       hostname, plugin, plugin_instance, type, type_instance);
        if (status != 0)
                return (-1);
 
@@ -562,6 +561,7 @@ static void *us_server_thread (void *arg)
        int  status;
        int *remote_fd;
        pthread_t th;
+       pthread_attr_t th_attr;
 
        if (us_open_socket () != 0)
                pthread_exit ((void *) 1);
@@ -594,7 +594,10 @@ static void *us_server_thread (void *arg)
 
                DBG ("Spawning child to handle connection on fd #%i", *remote_fd);
 
-               status = pthread_create (&th, NULL, us_handle_client, (void *) remote_fd);
+               pthread_attr_init (&th_attr);
+               pthread_attr_setdetachstate (&th_attr, PTHREAD_CREATE_DETACHED);
+
+               status = pthread_create (&th, &th_attr, us_handle_client, (void *) remote_fd);
                if (status != 0)
                {
                        syslog (LOG_WARNING, "unixsock plugin: pthread_create failed: %s",
@@ -657,6 +660,10 @@ static int us_shutdown (void)
                pthread_join (listen_thread, &ret);
        }
 
+       plugin_unregister_init ("unixsock");
+       plugin_unregister_write ("unixsock");
+       plugin_unregister_shutdown ("unixsock");
+
        return (0);
 } /* int us_shutdown */