X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=59397594b914c2c99533ff408d77d9c824c08034;hp=8ddd5a372005490bb37f1ef8c01bc8045dabdbde;hb=d3e2ba59faddb31870e2ce29b6a881f7ad5ad883;hpb=094d1690f11fb6aeddac6acd71ba50a3c4e4e9b1

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 8ddd5a372..59397594b 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -367,19 +367,16 @@ int main(int argc, char **argv)
 	lttng_consumer_set_error_sock(ctx, ret);
 
 	/*
-	 * For UST consumer, we block RT signals used for periodical metadata flush
-	 * in main and create a dedicated thread to handle these signals.
+	 * Block RT signals used for UST periodical metadata flush and the live
+	 * timer in main, and create a dedicated thread to handle these signals.
 	 */
-	switch (opt_type) {
-	case LTTNG_CONSUMER32_UST:
-	case LTTNG_CONSUMER64_UST:
-		consumer_signal_init();
-		break;
-	default:
-		break;
-	}
+	consumer_signal_init();
+
 	ctx->type = opt_type;
 
+	/* Initialize communication library */
+	lttcomm_init();
+
 	/* Create thread to manage channels */
 	ret = pthread_create(&channel_thread, NULL, consumer_thread_channel_poll,
 			(void *) ctx);
@@ -412,25 +409,21 @@ int main(int argc, char **argv)
 		goto sessiond_error;
 	}
 
-	switch (opt_type) {
-	case LTTNG_CONSUMER32_UST:
-	case LTTNG_CONSUMER64_UST:
-		/* Create the thread to manage the metadata periodic timers */
-		ret = pthread_create(&metadata_timer_thread, NULL,
-				consumer_timer_metadata_thread, (void *) ctx);
-		if (ret != 0) {
-			perror("pthread_create");
-			goto metadata_timer_error;
-		}
+	/*
+	 * Create the thread to manage the UST metadata periodic timer and
+	 * live timer.
+	 */
+	ret = pthread_create(&metadata_timer_thread, NULL,
+			consumer_timer_thread, (void *) ctx);
+	if (ret != 0) {
+		perror("pthread_create");
+		goto metadata_timer_error;
+	}
 
-		ret = pthread_detach(metadata_timer_thread);
-		if (ret) {
-			errno = ret;
-			perror("pthread_detach");
-		}
-		break;
-	default:
-		break;
+	ret = pthread_detach(metadata_timer_thread);
+	if (ret) {
+		errno = ret;
+		perror("pthread_detach");
 	}
 
 metadata_timer_error: