X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=88ac59655d7208f434c9e255b702a32b31758213;hb=9eb061825ad8ebdf8c22d812eff0232d97d72cd2;hp=0765c9b538a6a9370570647fea6780fe49070705;hpb=50be2fc41b02ee04860b5199d0ce2d346b1ea7c2;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 0765c9b5..88ac5965 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -236,6 +236,7 @@ int handle_message(struct sock_info *sock_info,
 	struct ustcomm_ust_reply lur;
 	int shm_fd, wait_fd;
 	union ust_args args;
+	ssize_t len;
 
 	ust_lock();
 
@@ -346,6 +347,22 @@ end:
 			goto error;
 		}
 	}
+	/*
+	 * LTTNG_UST_TRACEPOINT_FIELD_LIST_GET needs to send the field
+	 * after the reply.
+	 */
+	if (lur.ret_code == USTCOMM_OK) {
+		switch (lum->cmd) {
+		case LTTNG_UST_TRACEPOINT_FIELD_LIST_GET:
+			len = ustcomm_send_unix_sock(sock,
+				&args.field_list.entry,
+				sizeof(args.field_list.entry));
+			if (len != sizeof(args.field_list.entry)) {
+				ret = -1;
+				goto error;
+			}
+		}
+	}
 	/*
 	 * We still have the memory map reference, and the fds have been
 	 * sent to the sessiond. We can therefore close those fds. Note
@@ -832,6 +849,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 +886,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 +908,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 {