X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Funixsock.c;h=45ed9c699b783fa9e9e10a4dfd482a594e59d1a4;hb=4fb5d4b471e3f6a24d7cd36272e48e57bcb2c68f;hp=215abdd01ec1daeaf8819781bbdd79cac5cc4af9;hpb=6c9f69a4507e2ec9490e2baf76146f4036aa2b8e;p=collectd.git diff --git a/src/unixsock.c b/src/unixsock.c index 215abdd0..45ed9c69 100644 --- a/src/unixsock.c +++ b/src/unixsock.c @@ -1,6 +1,6 @@ /** * collectd - src/unixsock.c - * Copyright (C) 2007 Florian octo Forster + * Copyright (C) 2007,2008 Florian octo Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -24,10 +24,14 @@ #include "plugin.h" #include "configfile.h" +#include "utils_cmd_putval.h" +#include "utils_cmd_putnotif.h" + /* Folks without pthread will need to disable this plugin. */ #include #include +#include #include #include @@ -36,7 +40,7 @@ # define UNIX_PATH_MAX sizeof (((struct sockaddr_un *)0)->sun_path) #endif -#define US_DEFAULT_PATH PREFIX"/var/run/"PACKAGE_NAME"-unixsock" +#define US_DEFAULT_PATH LOCALSTATEDIR"/run/"PACKAGE_NAME"-unixsock" /* * Private data structures @@ -79,7 +83,7 @@ static pthread_t listen_thread = (pthread_t) 0; /* Linked list and auxilliary variables for saving values */ static value_cache_t *cache_head = NULL; static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER; -static unsigned int cache_oldest = UINT_MAX; +static time_t cache_oldest = -1; /* * Functions @@ -186,7 +190,7 @@ static int cache_insert (const data_set_t *ds, const value_list_t *vl) cache_head = vc; vc->time = vl->time; - if (vc->time < cache_oldest) + if ((vc->time < cache_oldest) || (-1 == cache_oldest)) cache_oldest = vc->time; pthread_mutex_unlock (&cache_lock); @@ -273,7 +277,7 @@ static int cache_update (const data_set_t *ds, const value_list_t *vl) vc->ds = ds; vc->time = vl->time; - if (vc->time < cache_oldest) + if ((vc->time < cache_oldest) || (-1 == cache_oldest)) cache_oldest = vc->time; pthread_mutex_unlock (&cache_lock); @@ -329,7 +333,7 @@ static void cache_flush (int max_age) } /* while (this != NULL) */ pthread_mutex_unlock (&cache_lock); -} /* int cache_flush */ +} /* void cache_flush */ static int us_open_socket (void) { @@ -351,18 +355,21 @@ static int us_open_socket (void) sizeof (sa.sun_path) - 1); /* unlink (sa.sun_path); */ + DEBUG ("unixsock plugin: socket path = %s", sa.sun_path); + status = bind (sock_fd, (struct sockaddr *) &sa, sizeof (sa)); if (status != 0) { char errbuf[1024]; sstrerror (errno, errbuf, sizeof (errbuf)); - DEBUG ("bind failed: %s; sa.sun_path = %s", errbuf, sa.sun_path); ERROR ("unixsock plugin: bind failed: %s", errbuf); close (sock_fd); sock_fd = -1; return (-1); } + chmod (sa.sun_path, sock_perms); + status = listen (sock_fd, 8); if (status != 0) { @@ -487,153 +494,60 @@ static int us_handle_getval (FILE *fh, char **fields, int fields_num) return (0); } /* int us_handle_getval */ -static int us_handle_putval (FILE *fh, char **fields, int fields_num) +static int us_handle_listval (FILE *fh, char **fields, int fields_num) { - char *hostname; - char *plugin; - char *plugin_instance; - char *type; - char *type_instance; - int status; - int i; - - const data_set_t *ds; - value_list_t vl = VALUE_LIST_INIT; - - char **value_ptr; + char buffer[1024]; + char **value_list = NULL; + int value_list_len = 0; + value_cache_t *entry; + int i; - if (fields_num != 3) + if (fields_num != 1) { - DEBUG ("unixsock plugin: Wrong number of fields: %i", fields_num); - fprintf (fh, "-1 Wrong number of fields: Got %i, expected 3.\n", + DEBUG ("unixsock plugin: us_handle_listval: " + "Wrong number of fields: %i", fields_num); + fprintf (fh, "-1 Wrong number of fields: Got %i, expected 1.\n", fields_num); fflush (fh); return (-1); } - status = parse_identifier (fields[1], &hostname, - &plugin, &plugin_instance, - &type, &type_instance); - if (status != 0) - { - DEBUG ("unixsock plugin: Cannot parse `%s'", fields[1]); - fprintf (fh, "-1 Cannot parse identifier.\n"); - fflush (fh); - return (-1); - } - - if ((strlen (hostname) >= sizeof (vl.host)) - || (strlen (plugin) >= sizeof (vl.plugin)) - || ((plugin_instance != NULL) - && (strlen (plugin_instance) >= sizeof (vl.plugin_instance))) - || ((type_instance != NULL) - && (strlen (type_instance) >= sizeof (vl.type_instance)))) - { - fprintf (fh, "-1 Identifier too long."); - return (-1); - } - - strcpy (vl.host, hostname); - strcpy (vl.plugin, plugin); - if (plugin_instance != NULL) - strcpy (vl.plugin_instance, plugin_instance); - if (type_instance != NULL) - strcpy (vl.type_instance, type_instance); - - { /* parse the time */ - char *t = fields[2]; - char *v = strchr (t, ':'); - if (v == NULL) - { - fprintf (fh, "-1 No time found."); - return (-1); - } - *v = '\0'; v++; - - vl.time = (time_t) atoi (t); - if (vl.time == 0) - vl.time = time (NULL); - - fields[2] = v; - } - - ds = plugin_get_ds (type); - if (ds == NULL) - return (-1); - - value_ptr = (char **) calloc (ds->ds_num, sizeof (char *)); - if (value_ptr == NULL) - { - fprintf (fh, "-1 calloc failed."); - return (-1); - } - - { /* parse the value-list. It's colon-separated. */ - char *dummy; - char *ptr; - char *saveptr; - - i = 0; - dummy = fields[2]; - saveptr = NULL; - while ((ptr = strtok_r (dummy, ":", &saveptr)) != NULL) - { - dummy = NULL; - if (i >= ds->ds_num) - { - i = ds->ds_num + 1; - break; - } - value_ptr[i] = ptr; - i++; - } - - if (i != ds->ds_num) - { - sfree (value_ptr); - fprintf (fh, "-1 Number of values incorrect: Got %i, " - "expected %i.", i, ds->ds_num); - return (-1); - } - } /* done parsing the value-list */ + pthread_mutex_lock (&cache_lock); - vl.values_len = ds->ds_num; - vl.values = (value_t *) malloc (vl.values_len * sizeof (value_t)); - if (vl.values == NULL) + for (entry = cache_head; entry != NULL; entry = entry->next) { - sfree (value_ptr); - fprintf (fh, "-1 malloc failed."); - return (-1); - } - DEBUG ("value_ptr = 0x%p; vl.values = 0x%p;", (void *) value_ptr, (void *) vl.values); + char **tmp; - for (i = 0; i < ds->ds_num; i++) - { - if (strcmp (value_ptr[i], "U") == 0) - vl.values[i].gauge = NAN; - else if (ds->ds[i].type == DS_TYPE_COUNTER) - vl.values[i].counter = atoll (value_ptr[i]); - else if (ds->ds[i].type == DS_TYPE_GAUGE) - vl.values[i].gauge = atof (value_ptr[i]); - } /* for (i = 2 .. fields_num) */ + snprintf (buffer, sizeof (buffer), "%u %s\n", + (unsigned int) entry->time, entry->name); + buffer[sizeof (buffer) - 1] = '\0'; + + tmp = realloc (value_list, sizeof (char *) * (value_list_len + 1)); + if (tmp == NULL) + continue; + value_list = tmp; - plugin_dispatch_values (type, &vl); + value_list[value_list_len] = strdup (buffer); - DEBUG ("value_ptr = 0x%p; vl.values = 0x%p;", (void *) value_ptr, (void *) vl.values); + if (value_list[value_list_len] != NULL) + value_list_len++; + } /* for (entry) */ - sfree (value_ptr); - sfree (vl.values); + pthread_mutex_unlock (&cache_lock); - fprintf (fh, "0 Success\n"); + DEBUG ("unixsock plugin: us_handle_listval: value_list_len = %i", value_list_len); + fprintf (fh, "%i Values found\n", value_list_len); + for (i = 0; i < value_list_len; i++) + fputs (value_list[i], fh); fflush (fh); return (0); -} /* int us_handle_putval */ +} /* int us_handle_listval */ static void *us_handle_client (void *arg) { int fd; - FILE *fh; + FILE *fhin, *fhout; char buffer[1024]; char *fields[128]; int fields_num; @@ -644,8 +558,8 @@ static void *us_handle_client (void *arg) DEBUG ("Reading from fd #%i", fd); - fh = fdopen (fd, "r+"); - if (fh == NULL) + fhin = fdopen (fd, "r"); + if (fhin == NULL) { char errbuf[1024]; ERROR ("unixsock plugin: fdopen failed: %s", @@ -654,7 +568,17 @@ static void *us_handle_client (void *arg) pthread_exit ((void *) 1); } - while (fgets (buffer, sizeof (buffer), fh) != NULL) + fhout = fdopen (fd, "w"); + if (fhout == NULL) + { + char errbuf[1024]; + ERROR ("unixsock plugin: fdopen failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + fclose (fhin); /* this closes fd as well */ + pthread_exit ((void *) 1); + } + + while (fgets (buffer, sizeof (buffer), fhin) != NULL) { int len; @@ -679,23 +603,33 @@ static void *us_handle_client (void *arg) if (strcasecmp (fields[0], "getval") == 0) { - us_handle_getval (fh, fields, fields_num); + us_handle_getval (fhout, fields, fields_num); } else if (strcasecmp (fields[0], "putval") == 0) { - us_handle_putval (fh, fields, fields_num); + handle_putval (fhout, fields, fields_num); + } + else if (strcasecmp (fields[0], "listval") == 0) + { + us_handle_listval (fhout, fields, fields_num); + } + else if (strcasecmp (fields[0], "putnotif") == 0) + { + handle_putnotif (fhout, fields, fields_num); } else { - fprintf (fh, "-1 Unknown command: %s\n", fields[0]); - fflush (fh); + fprintf (fhout, "-1 Unknown command: %s\n", fields[0]); + fflush (fhout); } } /* while (fgets) */ DEBUG ("Exiting.."); - close (fd); + fclose (fhin); + fclose (fhout); pthread_exit ((void *) 0); + return ((void *) 0); } /* void *us_handle_client */ static void *us_server_thread (void *arg) @@ -710,7 +644,7 @@ static void *us_server_thread (void *arg) while (loop != 0) { - DEBUG ("Calling accept.."); + DEBUG ("unixsock plugin: Calling accept.."); status = accept (sock_fd, NULL, NULL); if (status < 0) { @@ -825,7 +759,6 @@ static int us_shutdown (void) } plugin_unregister_init ("unixsock"); - plugin_unregister_write ("unixsock"); plugin_unregister_shutdown ("unixsock"); return (0);