X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=deb2edf9ba1e5189cd1d9e40934abfc3da1e43ab;hp=5e19f379fbb05675a7d809d7878caa39c5c82b18;hb=ab0ee2ca29394fa28284b94cc3c598960660404f;hpb=8d9ce0bc94bfec4b7bd85f16cd068926e3dc7779

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 5e19f379f..deb2edf9b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1855,6 +1855,8 @@ static void *thread_dispatch_ust_registration(void *data)
 		.count = 0,
 	};
 
+	rcu_register_thread();
+
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
 
 	if (testpoint(sessiond_thread_app_reg_dispatch)) {
@@ -2088,6 +2090,7 @@ error_testpoint:
 		ERR("Health error occurred in %s", __func__);
 	}
 	health_unregister(health_sessiond);
+	rcu_unregister_thread();
 	return NULL;
 }
 
@@ -2195,10 +2198,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
@@ -3056,7 +3061,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_CREATE_SESSION:
 	case LTTNG_CREATE_SESSION_SNAPSHOT:
 	case LTTNG_CREATE_SESSION_LIVE:
-	case LTTNG_CALIBRATE:
 	case LTTNG_LIST_SESSIONS:
 	case LTTNG_LIST_TRACEPOINTS:
 	case LTTNG_LIST_SYSCALLS:
@@ -3898,12 +3902,6 @@ error_add_context:
 		ret = LTTNG_OK;
 		break;
 	}
-	case LTTNG_CALIBRATE:
-	{
-		ret = cmd_calibrate(cmd_ctx->lsm->domain.type,
-				&cmd_ctx->lsm->u.calibrate);
-		break;
-	}
 	case LTTNG_REGISTER_CONSUMER:
 	{
 		struct consumer_data *cdata;
@@ -4330,7 +4328,7 @@ error:
 	}
 
 	lttng_poll_clean(&events);
-
+	stop_threads();
 	rcu_unregister_thread();
 	return NULL;
 }
@@ -5368,9 +5366,6 @@ error:
 static void sighandler(int sig)
 {
 	switch (sig) {
-	case SIGPIPE:
-		DBG("SIGPIPE caught");
-		return;
 	case SIGINT:
 		DBG("SIGINT caught");
 		stop_threads();
@@ -5402,9 +5397,10 @@ static int set_signal_handler(void)
 		return ret;
 	}
 
-	sa.sa_handler = sighandler;
 	sa.sa_mask = sigset;
 	sa.sa_flags = 0;
+
+	sa.sa_handler = sighandler;
 	if ((ret = sigaction(SIGTERM, &sa, NULL)) < 0) {
 		PERROR("sigaction");
 		return ret;
@@ -5415,12 +5411,13 @@ static int set_signal_handler(void)
 		return ret;
 	}
 
-	if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) {
+	if ((ret = sigaction(SIGUSR1, &sa, NULL)) < 0) {
 		PERROR("sigaction");
 		return ret;
 	}
 
-	if ((ret = sigaction(SIGUSR1, &sa, NULL)) < 0) {
+	sa.sa_handler = SIG_IGN;
+	if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) {
 		PERROR("sigaction");
 		return ret;
 	}
@@ -5976,7 +5973,7 @@ int main(int argc, char **argv)
 	}
 	load_info->path = opt_load_session_path;
 
-	/* Create health-check thread */
+	/* Create health-check thread. */
 	ret = pthread_create(&health_thread, default_pthread_attr(),
 			thread_manage_health, (void *) NULL);
 	if (ret) {
@@ -6153,6 +6150,12 @@ exit_client:
 exit_health:
 
 exit_init_data:
+	/*
+	 * Wait for all pending call_rcu work to complete before tearing
+	 * down data structures. call_rcu worker may be trying to
+	 * perform lookups in those structures.
+	 */
+	rcu_barrier();
 	/*
 	 * sessiond_cleanup() is called when no other thread is running, except
 	 * the ht_cleanup thread, which is needed to destroy the hash tables.