projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various plugins: Don't call "time(2)" in the plugins to set vl.time.
[collectd.git]
/
src
/
unixsock.c
diff --git
a/src/unixsock.c
b/src/unixsock.c
index
d800906
..
0b89748
100644
(file)
--- a/
src/unixsock.c
+++ b/
src/unixsock.c
@@
-26,6
+26,7
@@
#include "utils_cmd_flush.h"
#include "utils_cmd_getval.h"
#include "utils_cmd_flush.h"
#include "utils_cmd_getval.h"
+#include "utils_cmd_getthreshold.h"
#include "utils_cmd_listval.h"
#include "utils_cmd_putval.h"
#include "utils_cmd_putnotif.h"
#include "utils_cmd_listval.h"
#include "utils_cmd_putval.h"
#include "utils_cmd_putnotif.h"
@@
-157,32
+158,45
@@
static int us_open_socket (void)
static void *us_handle_client (void *arg)
{
static void *us_handle_client (void *arg)
{
- int fd;
+ int fdin;
+ int fdout;
FILE *fhin, *fhout;
FILE *fhin, *fhout;
- fd = *((int *) arg);
+ fd
in
= *((int *) arg);
free (arg);
arg = NULL;
free (arg);
arg = NULL;
- DEBUG ("unixsock plugin: us_handle_client: Reading from fd #%i", fd);
+ DEBUG ("unixsock plugin: us_handle_client: Reading from fd #%i", fd
in
);
- fhin = fdopen (fd, "r");
+ fdout = dup (fdin);
+ if (fdout < 0)
+ {
+ char errbuf[1024];
+ ERROR ("unixsock plugin: dup failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ close (fdin);
+ pthread_exit ((void *) 1);
+ }
+
+ fhin = fdopen (fdin, "r");
if (fhin == NULL)
{
char errbuf[1024];
ERROR ("unixsock plugin: fdopen failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
if (fhin == NULL)
{
char errbuf[1024];
ERROR ("unixsock plugin: fdopen failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
- close (fd);
+ close (fdin);
+ close (fdout);
pthread_exit ((void *) 1);
}
pthread_exit ((void *) 1);
}
- fhout = fdopen (fd, "w");
+ fhout = fdopen (fd
out
, "w");
if (fhout == NULL)
{
char errbuf[1024];
ERROR ("unixsock plugin: fdopen failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
if (fhout == NULL)
{
char errbuf[1024];
ERROR ("unixsock plugin: fdopen failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
- fclose (fhin); /* this closes fd as well */
+ fclose (fhin); /* this closes fdin as well */
+ close (fdout);
pthread_exit ((void *) 1);
}
pthread_exit ((void *) 1);
}
@@
-230,17
+244,22
@@
static void *us_handle_client (void *arg)
fields_num = strsplit (buffer_copy, fields,
sizeof (fields) / sizeof (fields[0]));
fields_num = strsplit (buffer_copy, fields,
sizeof (fields) / sizeof (fields[0]));
-
if (fields_num < 1)
{
if (fields_num < 1)
{
- close (fd);
- break;
+ fprintf (fhout, "-1 Internal error\n");
+ fclose (fhin);
+ fclose (fhout);
+ pthread_exit ((void *) 1);
}
if (strcasecmp (fields[0], "getval") == 0)
{
handle_getval (fhout, buffer);
}
}
if (strcasecmp (fields[0], "getval") == 0)
{
handle_getval (fhout, buffer);
}
+ else if (strcasecmp (fields[0], "getthreshold") == 0)
+ {
+ handle_getthreshold (fhout, buffer);
+ }
else if (strcasecmp (fields[0], "putval") == 0)
{
handle_putval (fhout, buffer);
else if (strcasecmp (fields[0], "putval") == 0)
{
handle_putval (fhout, buffer);
@@
-278,7
+297,7
@@
static void *us_handle_client (void *arg)
return ((void *) 0);
} /* void *us_handle_client */
return ((void *) 0);
} /* void *us_handle_client */
-static void *us_server_thread (void *arg)
+static void *us_server_thread (void
__attribute__((unused))
*arg)
{
int status;
int *remote_fd;
{
int status;
int *remote_fd;
@@
-383,8
+402,15
@@
static int us_config (const char *key, const char *val)
static int us_init (void)
{
static int us_init (void)
{
+ static int have_init = 0;
+
int status;
int status;
+ /* Initialize only once. */
+ if (have_init != 0)
+ return (0);
+ have_init = 1;
+
loop = 1;
status = pthread_create (&listen_thread, NULL, us_server_thread, NULL);
loop = 1;
status = pthread_create (&listen_thread, NULL, us_server_thread, NULL);