X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=a464e88bfee2143e429273c646adabbf8aaa61bb;hb=6ddc916dfa930b6b9018ffd53a76faeb61b81ebd;hp=7a9097014d26e4d483f4d4a9f7d98cbd581807d9;hpb=e8508a495280a1396a0319a157409a7ea61ffc5a;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 7a909701..a464e88b 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -43,6 +43,7 @@
 #include <lttng/ust.h>
 #include <ust-comm.h>
 #include <usterr-signal-safe.h>
+#include <helper.h>
 #include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 #include "compat.h"
@@ -136,6 +137,15 @@ extern void ltt_ring_buffer_client_overwrite_exit(void);
 extern void ltt_ring_buffer_client_discard_exit(void);
 extern void ltt_ring_buffer_metadata_client_exit(void);
 
+/*
+ * Force a read (imply TLS fixup for dlopen) of TLS variables.
+ */
+static
+void lttng_fixup_nest_count_tls(void)
+{
+	asm volatile ("" : : "m" (lttng_ust_nest_count));
+}
+
 static
 int setup_local_apps(void)
 {
@@ -272,6 +282,74 @@ int handle_message(struct sock_info *sock_info,
 		else
 			ret = lttng_ust_objd_unref(lum->handle);
 		break;
+	case LTTNG_UST_FILTER:
+	{
+		/* Receive filter data */
+		struct lttng_ust_filter_bytecode *bytecode;
+
+		if (lum->u.filter.data_size > FILTER_BYTECODE_MAX_LEN) {
+			ERR("Filter data size is too large: %u bytes\n",
+				lum->u.filter.data_size);
+			ret = -EINVAL;
+			goto error;
+		}
+
+		if (lum->u.filter.reloc_offset > lum->u.filter.data_size - 1) {
+			ERR("Filter reloc offset %u is not within data\n",
+				lum->u.filter.reloc_offset);
+			ret = -EINVAL;
+			goto error;
+		}
+
+		bytecode = zmalloc(sizeof(*bytecode) + lum->u.filter.data_size);
+		if (!bytecode) {
+			ret = -ENOMEM;
+			goto error;
+		}
+		len = ustcomm_recv_unix_sock(sock, bytecode->data,
+				lum->u.filter.data_size);
+		switch (len) {
+		case 0:	/* orderly shutdown */
+			ret = 0;
+			free(bytecode);
+			goto error;
+		case -1:
+			DBG("Receive failed from lttng-sessiond with errno %d", errno);
+			if (errno == ECONNRESET) {
+				ERR("%s remote end closed connection\n", sock_info->name);
+				ret = -EINVAL;
+				free(bytecode);
+				goto error;
+			}
+			ret = -EINVAL;
+			goto end;
+		default:
+			if (len == lum->u.filter.data_size) {
+				DBG("filter data received\n");
+				break;
+			} else {
+				ERR("incorrect filter data message size: %zd\n", len);
+				ret = -EINVAL;
+				free(bytecode);
+				goto end;
+			}
+		}
+		bytecode->len = lum->u.filter.data_size;
+		bytecode->reloc_offset = lum->u.filter.reloc_offset;
+		if (ops->cmd) {
+			ret = ops->cmd(lum->handle, lum->cmd,
+					(unsigned long) bytecode,
+					&args);
+			if (ret) {
+				free(bytecode);
+			}
+			/* don't free bytecode if everything went fine. */
+		} else {
+			ret = -ENOSYS;
+			free(bytecode);
+		}
+		break;
+	}
 	default:
 		if (ops->cmd)
 			ret = ops->cmd(lum->handle, lum->cmd,
@@ -538,9 +616,9 @@ int get_wait_shm(struct sock_info *sock_info, size_t mmap_size)
 			ret = ftruncate(wait_shm_fd, mmap_size);
 			if (ret) {
 				PERROR("ftruncate");
-				exit(EXIT_FAILURE);
+				_exit(EXIT_FAILURE);
 			}
-			exit(EXIT_SUCCESS);
+			_exit(EXIT_SUCCESS);
 		}
 		/*
 		 * For local shm, we need to have rw access to accept
@@ -552,13 +630,13 @@ int get_wait_shm(struct sock_info *sock_info, size_t mmap_size)
 		 */
 		if (!sock_info->global && errno != EACCES) {
 			ERR("Error opening shm %s", sock_info->wait_shm_path);
-			exit(EXIT_FAILURE);
+			_exit(EXIT_FAILURE);
 		}
 		/*
 		 * The shm exists, but we cannot open it RW. Report
 		 * success.
 		 */
-		exit(EXIT_SUCCESS);
+		_exit(EXIT_SUCCESS);
 	} else {
 		return -1;
 	}
@@ -672,7 +750,7 @@ error:
  * This thread does not allocate any resource, except within
  * handle_message, within mutex protection. This mutex protects against
  * fork and exit.
- * The other moment it allocates resources is at socket connexion, which
+ * The other moment it allocates resources is at socket connection, which
  * is also protected by the mutex.
  */
 static
@@ -858,6 +936,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 {
 	struct timespec constructor_timeout;
 	sigset_t sig_all_blocked, orig_parent_mask;
+	pthread_attr_t thread_attr;
 	int timeout_mode;
 	int ret;
 
@@ -872,6 +951,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	lttng_fixup_event_tls();
 	lttng_fixup_ringbuffer_tls();
 	lttng_fixup_vtid_tls();
+	lttng_fixup_nest_count_tls();
 
 	/*
 	 * We want precise control over the order in which we construct
@@ -906,13 +986,22 @@ void __attribute__((constructor)) lttng_ust_init(void)
 		ERR("pthread_sigmask: %s", strerror(ret));
 	}
 
-	ret = pthread_create(&global_apps.ust_listener, NULL,
+	ret = pthread_attr_init(&thread_attr);
+	if (ret) {
+		ERR("pthread_attr_init: %s", strerror(ret));
+	}
+	ret = pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_DETACHED);
+	if (ret) {
+		ERR("pthread_attr_setdetachstate: %s", strerror(ret));
+	}
+
+	ret = pthread_create(&global_apps.ust_listener, &thread_attr,
 			ust_listener_thread, &global_apps);
 	if (ret) {
 		ERR("pthread_create global: %s", strerror(ret));
 	}
 	if (local_apps.allowed) {
-		ret = pthread_create(&local_apps.ust_listener, NULL,
+		ret = pthread_create(&local_apps.ust_listener, &thread_attr,
 				ust_listener_thread, &local_apps);
 		if (ret) {
 			ERR("pthread_create local: %s", strerror(ret));
@@ -920,6 +1009,10 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	} else {
 		handle_register_done(&local_apps);
 	}
+	ret = pthread_attr_destroy(&thread_attr);
+	if (ret) {
+		ERR("pthread_attr_destroy: %s", strerror(ret));
+	}
 
 	/* Restore original signal mask in parent */
 	ret = pthread_sigmask(SIG_SETMASK, &orig_parent_mask, NULL);