X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Funixsock.c;h=7e7a1b1a857eb73c4529dd038d011f3b19cf1ed7;hb=cc7ac931beb379f43fa08a145140a37dd8c1b449;hp=6de1395662161a66aaacafa389efa1e680583bf9;hpb=853b3da5d4c6614d7db4093f57b1ca4f57b6c485;p=collectd.git

diff --git a/src/unixsock.c b/src/unixsock.c
index 6de13956..7e7a1b1a 100644
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -206,6 +206,7 @@ static void *us_handle_client (void *arg)
 		close (fdin);
 		close (fdout);
 		pthread_exit ((void *) 1);
+		return ((void *) 1);
 	}
 
 	fhout = fdopen (fdout, "w");
@@ -217,6 +218,7 @@ static void *us_handle_client (void *arg)
 		fclose (fhin); /* this closes fdin as well */
 		close (fdout);
 		pthread_exit ((void *) 1);
+		return ((void *) 1);
 	}
 
 	/* change output buffer to line buffered mode */
@@ -228,6 +230,7 @@ static void *us_handle_client (void *arg)
 		fclose (fhin);
 		fclose (fhout);
 		pthread_exit ((void *) 1);
+		return ((void *) 0);
 	}
 
 	while (42)
@@ -241,6 +244,9 @@ static void *us_handle_client (void *arg)
 		errno = 0;
 		if (fgets (buffer, sizeof (buffer), fhin) == NULL)
 		{
+			if ((errno == EINTR) || (errno == EAGAIN))
+				continue;
+
 			if (errno != 0)
 			{
 				char errbuf[1024];
@@ -269,6 +275,7 @@ static void *us_handle_client (void *arg)
 			fclose (fhin);
 			fclose (fhout);
 			pthread_exit ((void *) 1);
+			return ((void *) 1);
 		}
 
 		if (strcasecmp (fields[0], "getval") == 0)
@@ -323,6 +330,9 @@ static void *us_server_thread (void __attribute__((unused)) *arg)
 	pthread_t th;
 	pthread_attr_t th_attr;
 
+	pthread_attr_init (&th_attr);
+	pthread_attr_setdetachstate (&th_attr, PTHREAD_CREATE_DETACHED);
+
 	if (us_open_socket () != 0)
 		pthread_exit ((void *) 1);
 
@@ -341,6 +351,7 @@ static void *us_server_thread (void __attribute__((unused)) *arg)
 					sstrerror (errno, errbuf, sizeof (errbuf)));
 			close (sock_fd);
 			sock_fd = -1;
+			pthread_attr_destroy (&th_attr);
 			pthread_exit ((void *) 1);
 		}
 
@@ -357,10 +368,8 @@ static void *us_server_thread (void __attribute__((unused)) *arg)
 
 		DEBUG ("Spawning child to handle connection on fd #%i", *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);
+		status = plugin_thread_create (&th, &th_attr,
+				us_handle_client, (void *) remote_fd);
 		if (status != 0)
 		{
 			char errbuf[1024];
@@ -374,6 +383,7 @@ static void *us_server_thread (void __attribute__((unused)) *arg)
 
 	close (sock_fd);
 	sock_fd = -1;
+	pthread_attr_destroy (&th_attr);
 
 	status = unlink ((sock_file != NULL) ? sock_file : US_DEFAULT_PATH);
 	if (status != 0)
@@ -439,7 +449,8 @@ static int us_init (void)
 
 	loop = 1;
 
-	status = pthread_create (&listen_thread, NULL, us_server_thread, NULL);
+	status = plugin_thread_create (&listen_thread, NULL,
+			us_server_thread, NULL);
 	if (status != 0)
 	{
 		char errbuf[1024];