projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.5' into collectd-4.6
[collectd.git]
/
src
/
unixsock.c
diff --git
a/src/unixsock.c
b/src/unixsock.c
index
d34b91f
..
57f3450
100644
(file)
--- a/
src/unixsock.c
+++ b/
src/unixsock.c
@@
-159,15
+159,12
@@
static void *us_handle_client (void *arg)
{
int fd;
FILE *fhin, *fhout;
{
int fd;
FILE *fhin, *fhout;
- char buffer[1024];
- char *fields[128];
- int fields_num;
fd = *((int *) arg);
free (arg);
arg = NULL;
fd = *((int *) arg);
free (arg);
arg = NULL;
- DEBUG ("Reading from fd #%i", fd);
+ DEBUG ("
unixsock plugin: us_handle_client:
Reading from fd #%i", fd);
fhin = fdopen (fd, "r");
if (fhin == NULL)
fhin = fdopen (fd, "r");
if (fhin == NULL)
@@
-202,7
+199,11
@@
static void *us_handle_client (void *arg)
while (42)
{
while (42)
{
- int len;
+ char buffer[1024];
+ char buffer_copy[1024];
+ char *fields[128];
+ int fields_num;
+ int len;
errno = 0;
if (fgets (buffer, sizeof (buffer), fhin) == NULL)
errno = 0;
if (fgets (buffer, sizeof (buffer), fhin) == NULL)
@@
-225,9
+226,9
@@
static void *us_handle_client (void *arg)
if (len == 0)
continue;
if (len == 0)
continue;
-
DEBUG ("fgets -> buffer = %s; len = %i;", buffer, len
);
+
sstrncpy (buffer_copy, buffer, sizeof (buffer_copy)
);
- fields_num = strsplit (buffer, fields,
+ fields_num = strsplit (buffer
_copy
, fields,
sizeof (fields) / sizeof (fields[0]));
if (fields_num < 1)
sizeof (fields) / sizeof (fields[0]));
if (fields_num < 1)
@@
-238,23
+239,23
@@
static void *us_handle_client (void *arg)
if (strcasecmp (fields[0], "getval") == 0)
{
if (strcasecmp (fields[0], "getval") == 0)
{
- handle_getval (fhout,
fields, fields_num
);
+ handle_getval (fhout,
buffer
);
}
else if (strcasecmp (fields[0], "putval") == 0)
{
}
else if (strcasecmp (fields[0], "putval") == 0)
{
- handle_putval (fhout,
fields, fields_num
);
+ handle_putval (fhout,
buffer
);
}
else if (strcasecmp (fields[0], "listval") == 0)
{
}
else if (strcasecmp (fields[0], "listval") == 0)
{
- handle_listval (fhout,
fields, fields_num
);
+ handle_listval (fhout,
buffer
);
}
else if (strcasecmp (fields[0], "putnotif") == 0)
{
}
else if (strcasecmp (fields[0], "putnotif") == 0)
{
- handle_putnotif (fhout,
fields, fields_num
);
+ handle_putnotif (fhout,
buffer
);
}
else if (strcasecmp (fields[0], "flush") == 0)
{
}
else if (strcasecmp (fields[0], "flush") == 0)
{
- handle_flush (fhout,
fields, fields_num
);
+ handle_flush (fhout,
buffer
);
}
else
{
}
else
{
@@
-269,7
+270,7
@@
static void *us_handle_client (void *arg)
}
} /* while (fgets) */
}
} /* while (fgets) */
- DEBUG ("Exiting..");
+ DEBUG ("
unixsock plugin: us_handle_client:
Exiting..");
fclose (fhin);
fclose (fhout);
fclose (fhin);
fclose (fhout);
@@
-277,7
+278,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;
@@
-382,8
+383,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);