X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=91fba2643fc2ae94acf79850fd0e9aa589cfbf90;hb=c617c0c651432f9d5ae7adf4c5c1a5fd92ad828e;hp=7e9f9dc643b3c3f97fa52f261f47f14c11bff9a7;hpb=6993eeb37fb4caf9b92c09d4ab1730dcc2b8b097;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 7e9f9dc64..91fba2643 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;
 	}
 
@@ -728,12 +728,7 @@ static void *thread_manage_kernel(void *data)
 			update_poll_flag = 0;
 		}
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
-		DBG("Thread kernel polling on %d fds", nb_fd);
-
-		/* Zeroed the poll events */
-		lttng_poll_reset(&events);
+		DBG("Thread kernel polling on %d fds", events.nb_fd);
 
 		/* Poll infinite value of time */
 	restart:
@@ -755,6 +750,8 @@ static void *thread_manage_kernel(void *data)
 			continue;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -886,8 +883,6 @@ static void *thread_manage_consumer(void *data)
 		goto error;
 	}
 
-	nb_fd = LTTNG_POLL_GETNB(&events);
-
 	health_code_update(&consumer_data->health);
 
 	/* Inifinite blocking call, waiting for transmission */
@@ -910,6 +905,8 @@ restart:
 		goto error;
 	}
 
+	nb_fd = ret;
+
 	for (i = 0; i < nb_fd; i++) {
 		/* Fetch once the poll data */
 		revents = LTTNG_POLL_GETEV(&events, i);
@@ -987,9 +984,6 @@ restart:
 
 	health_code_update(&consumer_data->health);
 
-	/* Update number of fd */
-	nb_fd = LTTNG_POLL_GETNB(&events);
-
 	/* Inifinite blocking call, waiting for transmission */
 restart_poll:
 	health_poll_update(&consumer_data->health);
@@ -1005,6 +999,8 @@ restart_poll:
 		goto error;
 	}
 
+	nb_fd = ret;
+
 	for (i = 0; i < nb_fd; i++) {
 		/* Fetch once the poll data */
 		revents = LTTNG_POLL_GETEV(&events, i);
@@ -1126,12 +1122,7 @@ static void *thread_manage_apps(void *data)
 	health_code_update(&health_thread_app_manage);
 
 	while (1) {
-		/* Zeroed the events structure */
-		lttng_poll_reset(&events);
-
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
-		DBG("Apps thread polling on %d fds", nb_fd);
+		DBG("Apps thread polling on %d fds", events.nb_fd);
 
 		/* Inifinite blocking call, waiting for transmission */
 	restart:
@@ -1148,6 +1139,8 @@ static void *thread_manage_apps(void *data)
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -1405,8 +1398,6 @@ static void *thread_registration_apps(void *data)
 	while (1) {
 		DBG("Accepting application registration");
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
 		/* Inifinite blocking call, waiting for transmission */
 	restart:
 		health_poll_update(&health_thread_app_reg);
@@ -1422,6 +1413,8 @@ static void *thread_registration_apps(void *data)
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			health_code_update(&health_thread_app_reg);
 
@@ -1684,10 +1677,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");
@@ -1866,7 +1859,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
@@ -1909,6 +1902,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");
@@ -2982,8 +2977,6 @@ static void *thread_manage_health(void *data)
 	while (1) {
 		DBG("Health check ready");
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
 		/* Inifinite blocking call, waiting for transmission */
 restart:
 		ret = lttng_poll_wait(&events, -1);
@@ -2997,6 +2990,8 @@ restart:
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -3181,8 +3176,6 @@ static void *thread_manage_clients(void *data)
 	while (1) {
 		DBG("Accepting client command ...");
 
-		nb_fd = LTTNG_POLL_GETNB(&events);
-
 		/* Inifinite blocking call, waiting for transmission */
 	restart:
 		health_poll_update(&health_thread_cmd);
@@ -3198,6 +3191,8 @@ static void *thread_manage_clients(void *data)
 			goto error;
 		}
 
+		nb_fd = ret;
+
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
 			revents = LTTNG_POLL_GETEV(&events, i);
@@ -3855,7 +3850,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;
 	}