X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=5952334cd47fe1c1d882e9c7880e627218fb044b;hp=e5d7ba1c60051aebdd6c1f435b6c692294065e6f;hb=fb3a43a9284f3300e9b66edc2f2c2d2767895423;hpb=f02e1e8a5820da2eda835add020f92ca8d32c973

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index e5d7ba1c6..5952334cd 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -44,14 +44,15 @@
 #include <common/defaults.h>
 #include <common/common.h>
 #include <common/consumer.h>
+#include <common/compat/poll.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 
 #include "lttng-consumerd.h"
 
 /* TODO : support UST (all direct kernel-ctl accesses). */
 
-/* the two threads (receive fd and poll) */
-static pthread_t threads[2];
+/* the two threads (receive fd, poll and metadata) */
+static pthread_t threads[3];
 
 /* to count the number of times the user pressed ctrl+c */
 static int sigintcount = 0;
@@ -283,6 +284,9 @@ int main(int argc, char **argv)
 		}
 	}
 
+	/* Set up max poll set size */
+	lttng_poll_set_max_size();
+
 	if (strlen(command_sock_path) == 0) {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
@@ -376,12 +380,12 @@ int main(int argc, char **argv)
 		}
 	}
 	ret = EXIT_SUCCESS;
-	lttng_consumer_send_error(ctx, CONSUMERD_EXIT_SUCCESS);
+	lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_SUCCESS);
 	goto end;
 
 error:
 	ret = EXIT_FAILURE;
-	lttng_consumer_send_error(ctx, CONSUMERD_EXIT_FAILURE);
+	lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_FAILURE);
 
 end:
 	lttng_consumer_destroy(ctx);