X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=9fb4747536ad7fb3551217f1f3d6aaa0198caae6;hp=764cf4cb0f59ff981629c99078b31676d0f700b2;hb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;hpb=6bf8b7f3d399057540d8fc58f3e7b0b408e31e24

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 764cf4cb0..9fb474753 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <fcntl.h>
 #include <getopt.h>
@@ -38,14 +37,13 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <assert.h>
-#include <config.h>
 #include <urcu/compiler.h>
 #include <ulimit.h>
 
 #include <common/defaults.h>
 #include <common/common.h>
-#include <common/consumer.h>
-#include <common/consumer-timer.h>
+#include <common/consumer/consumer.h>
+#include <common/consumer/consumer-timer.h>
 #include <common/compat/poll.h>
 #include <common/compat/getenv.h>
 #include <common/sessiond-comm/sessiond-comm.h>
@@ -101,15 +99,9 @@ static void sighandler(int sig)
 		return;
 	}
 
-	/*
-	 * Ignore SIGPIPE because it should not stop the consumer whenever a
-	 * SIGPIPE is catched through a FD operation.
-	 */
-	if (sig == SIGPIPE) {
-		return;
+	if (ctx) {
+		lttng_consumer_should_exit(ctx);
 	}
-
-	lttng_consumer_should_exit(ctx);
 }
 
 /*
@@ -127,9 +119,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;
@@ -140,6 +133,7 @@ static int set_signal_handler(void)
 		return ret;
 	}
 
+	sa.sa_handler = SIG_IGN;
 	if ((ret = sigaction(SIGPIPE, &sa, NULL)) < 0) {
 		PERROR("sigaction");
 		return ret;
@@ -312,6 +306,9 @@ int main(int argc, char **argv)
 {
 	int ret = 0, retval = 0;
 	void *status;
+	struct lttng_consumer_local_data *tmp_ctx;
+
+	rcu_register_thread();
 
 	if (set_signal_handler()) {
 		retval = -1;
@@ -361,12 +358,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:
@@ -419,6 +410,10 @@ int main(int argc, char **argv)
 		set_ulimit();
 	}
 
+	if (run_as_create_worker(argv[0]) < 0) {
+		goto exit_init_data;
+	}
+
 	/* create the consumer instance with and assign the callbacks */
 	ctx = lttng_consumer_create(opt_type, lttng_consumer_read_subbuffer,
 		NULL, lttng_consumer_on_recv_stream, NULL);
@@ -493,7 +488,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;
@@ -512,7 +507,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) {
@@ -523,7 +518,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) {
@@ -534,8 +529,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");
@@ -543,8 +538,8 @@ int main(int argc, char **argv)
 		goto exit_data_thread;
 	}
 
-	/* Create the thread to manage the receive of fd */
-	ret = pthread_create(&sessiond_thread, NULL,
+	/* Create the thread to manage the reception of fds */
+	ret = pthread_create(&sessiond_thread, default_pthread_attr(),
 			consumer_thread_sessiond_poll,
 			(void *) ctx);
 	if (ret) {
@@ -558,7 +553,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;
@@ -588,6 +583,14 @@ exit_metadata_timer_thread:
 		PERROR("pthread_join sessiond_thread");
 		retval = -1;
 	}
+
+	ret = consumer_timer_thread_get_channel_monitor_pipe();
+	if (ret >= 0) {
+		ret = close(ret);
+		if (ret) {
+			PERROR("close channel monitor pipe");
+		}
+	}
 exit_sessiond_thread:
 
 	ret = pthread_join(data_thread, &status);
@@ -626,19 +629,31 @@ exit_health_thread:
 exit_health_pipe:
 
 exit_init_data:
-	lttng_consumer_destroy(ctx);
+	tmp_ctx = ctx;
+	ctx = NULL;
+	cmm_barrier();	/* Clear ctx for signal handler. */
+	/*
+	 * 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();
+	lttng_consumer_destroy(tmp_ctx);
 	lttng_consumer_cleanup();
 
 	if (health_consumerd) {
 		health_app_destroy(health_consumerd);
 	}
-exit_health_consumerd_cleanup:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
 
-exit_options:
+	run_as_destroy_worker();
 
+exit_health_consumerd_cleanup:
+exit_options:
 exit_set_signal_handler:
-	/* Ensure all prior call_rcu are done. */
-	rcu_barrier();
+
+	rcu_unregister_thread();
 
 	if (!retval) {
 		exit(EXIT_SUCCESS);