X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=1636b9c0d22777798ff220df010c4bc5ca6c9634;hp=87ffb05dd5c78af8a70472900f985f5fd9dd3f1f;hb=1a1a34b40ab10a195633b1ed5e2e9b42fdae0a78;hpb=c8fea79c745d42ea8143b7020ae11b4fc2da0d8a

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 87ffb05dd..1636b9c0d 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -101,7 +101,7 @@ static void sighandler(int sig)
 
 	/*
 	 * Ignore SIGPIPE because it should not stop the consumer whenever a
-	 * SIGPIPE is catched through a FD operation.
+	 * SIGPIPE is caught through a FD operation.
 	 */
 	if (sig == SIGPIPE) {
 		return;
@@ -362,12 +362,6 @@ int main(int argc, char **argv)
 		goto exit_health_consumerd_cleanup;
 	}
 
-	/* Set up max poll set size */
-	if (lttng_poll_set_max_size()) {
-		retval = -1;
-		goto exit_init_data;
-	}
-
 	if (*command_sock_path == '\0') {
 		switch (opt_type) {
 		case LTTNG_CONSUMER_KERNEL:
@@ -498,7 +492,7 @@ int main(int argc, char **argv)
 	}
 
 	/* Create thread to manage the client socket */
-	ret = pthread_create(&health_thread, NULL,
+	ret = pthread_create(&health_thread, default_pthread_attr(),
 			thread_manage_health, (void *) NULL);
 	if (ret) {
 		errno = ret;
@@ -517,7 +511,7 @@ int main(int argc, char **argv)
 	cmm_smp_mb();	/* Read ready before following operations */
 
 	/* Create thread to manage channels */
-	ret = pthread_create(&channel_thread, NULL,
+	ret = pthread_create(&channel_thread, default_pthread_attr(),
 			consumer_thread_channel_poll,
 			(void *) ctx);
 	if (ret) {
@@ -528,7 +522,7 @@ int main(int argc, char **argv)
 	}
 
 	/* Create thread to manage the polling/writing of trace metadata */
-	ret = pthread_create(&metadata_thread, NULL,
+	ret = pthread_create(&metadata_thread, default_pthread_attr(),
 			consumer_thread_metadata_poll,
 			(void *) ctx);
 	if (ret) {
@@ -539,8 +533,8 @@ int main(int argc, char **argv)
 	}
 
 	/* Create thread to manage the polling/writing of trace data */
-	ret = pthread_create(&data_thread, NULL, consumer_thread_data_poll,
-			(void *) ctx);
+	ret = pthread_create(&data_thread, default_pthread_attr(),
+			consumer_thread_data_poll, (void *) ctx);
 	if (ret) {
 		errno = ret;
 		PERROR("pthread_create");
@@ -549,7 +543,7 @@ int main(int argc, char **argv)
 	}
 
 	/* Create the thread to manage the receive of fd */
-	ret = pthread_create(&sessiond_thread, NULL,
+	ret = pthread_create(&sessiond_thread, default_pthread_attr(),
 			consumer_thread_sessiond_poll,
 			(void *) ctx);
 	if (ret) {
@@ -563,7 +557,7 @@ int main(int argc, char **argv)
 	 * Create the thread to manage the UST metadata periodic timer and
 	 * live timer.
 	 */
-	ret = pthread_create(&metadata_timer_thread, NULL,
+	ret = pthread_create(&metadata_timer_thread, default_pthread_attr(),
 			consumer_timer_thread, (void *) ctx);
 	if (ret) {
 		errno = ret;