X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=184ac6be62de3c5667d06c126eb373aa3ce1d1d6;hb=fbb3b395a2bba6fb7ecdd85baf7f01cb5899d200;hp=f2cf2856a215d51406c8468f2fb1842b9c306067;hpb=0d9c5d7750202aa5f46cd7c6f642fb31fe1556c4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index f2cf2856a..184ac6be6 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -461,7 +461,7 @@ static void cleanup(void)
 static int send_unix_sock(int sock, void *buf, size_t len)
 {
 	/* Check valid length */
-	if (len <= 0) {
+	if (len == 0) {
 		return -1;
 	}
 
@@ -691,36 +691,40 @@ static void *thread_manage_kernel(void *data)
 
 	DBG("[thread] Thread manage kernel started");
 
+	/*
+	 * This first step of the while is to clean this structure which could free
+	 * non NULL pointers so zero it before the loop.
+	 */
+	memset(&events, 0, sizeof(events));
+
 	if (testpoint(thread_manage_kernel)) {
 		goto error_testpoint;
 	}
 
 	health_code_update(&health_thread_kernel);
 
-	ret = create_thread_poll_set(&events, 2);
-	if (ret < 0) {
-		goto error_poll_create;
-	}
-
-	ret = lttng_poll_add(&events, kernel_poll_pipe[0], LPOLLIN);
-	if (ret < 0) {
-		goto error;
-	}
-
 	if (testpoint(thread_manage_kernel_before_loop)) {
-		goto error;
+		goto error_testpoint;
 	}
 
 	while (1) {
 		health_code_update(&health_thread_kernel);
 
 		if (update_poll_flag == 1) {
-			/*
-			 * Reset number of fd in the poll set. Always 2 since there is the thread
-			 * quit pipe and the kernel pipe.
-			 */
-			events.nb_fd = 2;
+			/* Clean events object. We are about to populate it again. */
+			lttng_poll_clean(&events);
+
+			ret = create_thread_poll_set(&events, 2);
+			if (ret < 0) {
+				goto error_poll_create;
+			}
+
+			ret = lttng_poll_add(&events, kernel_poll_pipe[0], LPOLLIN);
+			if (ret < 0) {
+				goto error;
+			}
 
+			/* This will add the available kernel channel if any. */
 			ret = update_kernel_poll(&events);
 			if (ret < 0) {
 				goto error;
@@ -728,7 +732,7 @@ static void *thread_manage_kernel(void *data)
 			update_poll_flag = 0;
 		}
 
-		DBG("Thread kernel polling on %d fds", events.nb_fd);
+		DBG("Thread kernel polling on %d fds", LTTNG_POLL_GETNB(&events));
 
 		/* Poll infinite value of time */
 	restart:
@@ -768,7 +772,13 @@ static void *thread_manage_kernel(void *data)
 
 			/* Check for data on kernel pipe */
 			if (pollfd == kernel_poll_pipe[0] && (revents & LPOLLIN)) {
-				ret = read(kernel_poll_pipe[0], &tmp, 1);
+				do {
+					ret = read(kernel_poll_pipe[0], &tmp, 1);
+				} while (ret < 0 && errno == EINTR);
+				/*
+				 * Ret value is useless here, if this pipe gets any actions an
+				 * update is required anyway.
+				 */
 				update_poll_flag = 1;
 				continue;
 			} else {
@@ -1122,7 +1132,7 @@ static void *thread_manage_apps(void *data)
 	health_code_update(&health_thread_app_manage);
 
 	while (1) {
-		DBG("Apps thread polling on %d fds", events.nb_fd);
+		DBG("Apps thread polling on %d fds", LTTNG_POLL_GETNB(&events));
 
 		/* Inifinite blocking call, waiting for transmission */
 	restart:
@@ -1162,7 +1172,9 @@ static void *thread_manage_apps(void *data)
 					goto error;
 				} else if (revents & LPOLLIN) {
 					/* Empty pipe */
-					ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+					do {
+						ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+					} while (ret < 0 && errno == EINTR);
 					if (ret < 0 || ret < sizeof(ust_cmd)) {
 						PERROR("read apps cmd pipe");
 						goto error;
@@ -1314,8 +1326,10 @@ static void *thread_dispatch_ust_registration(void *data)
 			 * at some point in time or wait to the end of the world :)
 			 */
 			if (apps_cmd_pipe[1] >= 0) {
-				ret = write(apps_cmd_pipe[1], ust_cmd,
-						sizeof(struct ust_command));
+				do {
+					ret = write(apps_cmd_pipe[1], ust_cmd,
+							sizeof(struct ust_command));
+				} while (ret < 0 && errno == EINTR);
 				if (ret < 0) {
 					PERROR("write apps cmd pipe");
 					if (errno == EBADF) {
@@ -1677,10 +1691,10 @@ error:
 static int join_consumer_thread(struct consumer_data *consumer_data)
 {
 	void *status;
-	int ret;
 
 	/* Consumer pid must be a real one. */
 	if (consumer_data->pid > 0) {
+		int ret;
 		ret = kill(consumer_data->pid, SIGTERM);
 		if (ret) {
 			ERR("Error killing consumer daemon");
@@ -1859,7 +1873,7 @@ error:
  */
 static int start_consumerd(struct consumer_data *consumer_data)
 {
-	int ret, err;
+	int ret;
 
 	/*
 	 * Set the listen() state on the socket since there is a possible race
@@ -1902,6 +1916,8 @@ end:
 error:
 	/* Cleanup already created socket on error. */
 	if (consumer_data->err_sock >= 0) {
+		int err;
+
 		err = close(consumer_data->err_sock);
 		if (err < 0) {
 			PERROR("close consumer data error socket");
@@ -3848,7 +3864,7 @@ int main(int argc, char **argv)
 
 	/* Parse arguments */
 	progname = argv[0];
-	if ((ret = parse_args(argc, argv) < 0)) {
+	if ((ret = parse_args(argc, argv)) < 0) {
 		goto error;
 	}