X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=5d5703064a110cac4dd8ea389430b878dd8ff302;hb=ade7ce5245446944d27824943142773f7e4d0674;hp=4a9a7a4929200bfd53c838eed13b48f52dd0ae50;hpb=748b7b07caecdc5f7ac4a73e008a7d0a84d422c4;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 4a9a7a492..5d5703064 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -65,6 +65,8 @@ static int sigintcount = 0;
 /* Argument variables */
 int lttng_opt_quiet;    /* not static in error.h */
 int lttng_opt_verbose;  /* not static in error.h */
+int lttng_opt_mi;       /* not static in error.h */
+
 static int opt_daemon;
 static const char *progname;
 static char command_sock_path[PATH_MAX]; /* Global command socket path */
@@ -341,7 +343,10 @@ int main(int argc, char **argv)
 	}
 
 	/* Init */
-	lttng_consumer_init();
+	if (lttng_consumer_init() < 0) {
+		goto error;
+	}
+
 	/* Init socket timeouts */
 	lttcomm_init();
 	lttcomm_inet_init();
@@ -405,9 +410,6 @@ int main(int argc, char **argv)
 
 	ctx->type = opt_type;
 
-	/* Initialize communication library */
-	lttcomm_init();
-
 	ret = utils_create_pipe(health_quit_pipe);
 	if (ret < 0) {
 		goto error_health_pipe;
@@ -426,7 +428,7 @@ int main(int argc, char **argv)
 	 * sessiond thread reply to the sessiond that we are ready.
 	 */
 	while (uatomic_read(&lttng_consumer_ready)) {
-		sleep(1);
+		usleep(100000);
 	}
 	cmm_smp_mb();	/* Read ready before following operations */
 
@@ -520,15 +522,11 @@ health_error:
 error_health_pipe:
 	if (!ret) {
 		ret = EXIT_SUCCESS;
-		lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_SUCCESS);
 		goto end;
 	}
 
 error:
 	ret = EXIT_FAILURE;
-	if (ctx) {
-		lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_FAILURE);
-	}
 
 end:
 	lttng_consumer_destroy(ctx);