X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt-sessiond%2Fmain.c;h=46c98a5611b9e818c0c99e7e7a64bcd56a02b60e;hb=133842876fe8a87ba184c9ac2b6e004eb388fb73;hp=c72087ef25ddb88d27634e5d97d1967d1bec0277;hpb=7272acf55ec512708704dc5f1ad4f447e5b3ca8e;p=lttng-tools.git

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index c72087ef2..46c98a561 100644
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -701,6 +701,12 @@ static void *thread_manage_kernel(void *data)
 
 	while (1) {
 		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;
+
 			ret = update_kernel_poll(&events);
 			if (ret < 0) {
 				goto error;
@@ -1567,7 +1573,7 @@ static int create_ust_session(struct ltt_session *session,
 		struct lttng_domain *domain)
 {
 	int ret;
-	struct ltt_ust_session *lus;
+	struct ltt_ust_session *lus = NULL;
 	struct ust_app *app;
 
 	switch (domain->type) {
@@ -1579,6 +1585,7 @@ static int create_ust_session(struct ltt_session *session,
 		}
 		break;
 	default:
+		ret = LTTCOMM_UNKNOWN_DOMAIN;
 		goto error;
 	}
 
@@ -2306,7 +2313,7 @@ static int cmd_destroy_session(struct ltt_session *session, char *name)
 		perror("write kernel poll pipe");
 	}
 
-	ret = session_destroy(name);
+	ret = session_destroy(session);
 
 	return ret;
 }