X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=1964fe0cca3b80e57b8293d00aa12cfb92d18790;hb=28ce0ff234b384b2611179bd45bb8e37e2875f1a;hp=0eb2db53815cbd2d0ff3f69f9218cef735c8b738;hpb=9519a2bd6d842d99088bf7d0eeaf4b3605030273;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 0eb2db538..1964fe0cc 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -760,12 +760,6 @@ static void sessiond_cleanup_options(void)
 	free(kmod_extra_probes_list);
 
 	run_as_destroy_worker();
-
-	/* <fun> */
-	DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
-			"Matthew, BEET driven development works!%c[%dm",
-			27, 1, 31, 27, 0, 27, 1, 33, 27, 0);
-	/* </fun> */
 }
 
 /*
@@ -2201,10 +2195,12 @@ static void *thread_registration_apps(void *data)
 					 * lttcomm_setsockopt_snd_timeout expect msec as
 					 * parameter.
 					 */
-					(void) lttcomm_setsockopt_rcv_timeout(sock,
-							app_socket_timeout * 1000);
-					(void) lttcomm_setsockopt_snd_timeout(sock,
-							app_socket_timeout * 1000);
+					if (app_socket_timeout >= 0) {
+						(void) lttcomm_setsockopt_rcv_timeout(sock,
+								app_socket_timeout * 1000);
+						(void) lttcomm_setsockopt_snd_timeout(sock,
+								app_socket_timeout * 1000);
+					}
 
 					/*
 					 * Set the CLOEXEC flag. Return code is useless because
@@ -2378,7 +2374,7 @@ static int spawn_consumer_thread(struct consumer_data *consumer_data)
 	pthread_mutex_lock(&consumer_data->cond_mutex);
 
 	/* Get time for sem_timedwait absolute timeout */
-	clock_ret = clock_gettime(CLOCK_MONOTONIC, &timeout);
+	clock_ret = lttng_clock_gettime(CLOCK_MONOTONIC, &timeout);
 	/*
 	 * Set the timeout for the condition timed wait even if the clock gettime
 	 * call fails since we might loop on that call and we want to avoid to
@@ -4291,7 +4287,6 @@ restart:
 			if (ret) {
 				PERROR("close");
 			}
-			new_sock = -1;
 			continue;
 		}
 
@@ -4320,7 +4315,6 @@ restart:
 		if (ret) {
 			PERROR("close");
 		}
-		new_sock = -1;
 	}
 
 exit: