From: Wolfgang Puffitsch <Wolfgang.Puffitsch@onera.fr>
Date: Fri, 1 Jun 2012 16:04:37 +0000 (-0400)
Subject: Fix: Block all signals in listener thread
X-Git-Tag: v2.1.0-rc1~75
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=ae6a58bf72561c5b87594bb04764313c325437a9;p=lttng-ust.git

Fix: Block all signals in listener thread

The listener thread does not block signals and receives signals that are
intended for the application. As this can cause applications to fail,
the listener thread should block all signals. The attached patch is
derived from an old commit and fixes the issue.

Fixes #241

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 0765c9b5..76c8ee3d 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -832,6 +832,7 @@ int get_timeout(struct timespec *constructor_timeout)
 void __attribute__((constructor)) lttng_ust_init(void)
 {
 	struct timespec constructor_timeout;
+	sigset_t sig_all_blocked, orig_parent_mask;
 	int timeout_mode;
 	int ret;
 
@@ -868,6 +869,18 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	if (ret) {
 		ERR("Error setting up to local apps");
 	}
+
+	/* A new thread created by pthread_create inherits the signal mask
+	 * from the parent. To avoid any signal being received by the
+	 * listener thread, we block all signals temporarily in the parent,
+	 * while we create the listener thread.
+	 */
+	sigfillset(&sig_all_blocked);
+	ret = pthread_sigmask(SIG_SETMASK, &sig_all_blocked, &orig_parent_mask);
+	if (ret) {
+		PERROR("pthread_sigmask: %s", strerror(ret));
+	}
+
 	ret = pthread_create(&local_apps.ust_listener, NULL,
 			ust_listener_thread, &local_apps);
 
@@ -878,6 +891,12 @@ void __attribute__((constructor)) lttng_ust_init(void)
 		handle_register_done(&local_apps);
 	}
 
+	/* Restore original signal mask in parent */
+	ret = pthread_sigmask(SIG_SETMASK, &orig_parent_mask, NULL);
+	if (ret) {
+		PERROR("pthread_sigmask: %s", strerror(ret));
+	}
+
 	switch (timeout_mode) {
 	case 1:	/* timeout wait */
 		do {