X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=de03407b702aa5851f7fc69ae99633f5f08455f4;hb=d37ecb3fc622dee6f80f84c21f38d32eef407262;hp=9d0c010d502079a164e453cb67778f3a547cc2d1;hpb=94be38e8fd2d71397f79c0a368ba95678052e32d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 9d0c010d..de03407b 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -20,7 +20,8 @@
  */
 
 #define _LGPL_SOURCE
-#define _GNU_SOURCE
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/mman.h>
@@ -41,6 +42,7 @@
 #include <urcu/futex.h>
 #include <urcu/compiler.h>
 
+#include <lttng/align.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust.h>
@@ -59,6 +61,7 @@
 #include "clock.h"
 #include "../libringbuffer/getcpu.h"
 #include "getenv.h"
+#include "ust-events-internal.h"
 
 /* Concatenate lttng ust shared library name with its major version number. */
 #define LTTNG_UST_LIB_SO_NAME "liblttng-ust.so." __ust_stringify(CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR)
@@ -264,7 +267,7 @@ struct sock_info {
 	int statedump_pending;
 	int initial_statedump_done;
 	/* Keep procname for statedump */
-	char procname[LTTNG_UST_PROCNAME_LEN];
+	char procname[LTTNG_UST_ABI_PROCNAME_LEN];
 };
 
 /* Socket from app (connect) to session daemon (listen) for communication */
@@ -318,6 +321,8 @@ static const char *cmd_name_mapping[] = {
 	[ LTTNG_UST_REGISTER_DONE ] = "Registration Done",
 	[ LTTNG_UST_TRACEPOINT_FIELD_LIST ] = "Create Tracepoint Field List",
 
+	[ LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE ] = "Create event notifier group",
+
 	/* Session FD commands */
 	[ LTTNG_UST_CHANNEL ] = "Create Channel",
 	[ LTTNG_UST_SESSION_START ] = "Start Session",
@@ -342,6 +347,9 @@ static const char *cmd_name_mapping[] = {
 	/* Event FD commands */
 	[ LTTNG_UST_FILTER ] = "Create Filter",
 	[ LTTNG_UST_EXCLUSION ] = "Add exclusions to event",
+
+	/* Event notifier group commands */
+	[ LTTNG_UST_EVENT_NOTIFIER_CREATE ] = "Create event notifier",
 };
 
 static const char *str_timeout;
@@ -432,6 +440,7 @@ void lttng_ust_fixup_tls(void)
 	lttng_fixup_cgroup_ns_tls();
 	lttng_fixup_ipc_ns_tls();
 	lttng_fixup_net_ns_tls();
+	lttng_fixup_time_ns_tls();
 	lttng_fixup_uts_ns_tls();
 }
 
@@ -480,7 +489,7 @@ int setup_global_apps(void)
 	}
 
 	global_apps.allowed = 1;
-	lttng_ust_getprocname(global_apps.procname);
+	lttng_pthread_getname_np(global_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
 error:
 	return ret;
 }
@@ -526,7 +535,7 @@ int setup_local_apps(void)
 		goto end;
 	}
 
-	lttng_ust_getprocname(local_apps.procname);
+	lttng_pthread_getname_np(local_apps.procname, LTTNG_UST_ABI_PROCNAME_LEN);
 end:
 	return ret;
 }
@@ -735,6 +744,131 @@ void handle_pending_statedump(struct sock_info *sock_info)
 	}
 }
 
+static inline
+const char *bytecode_type_str(uint32_t cmd)
+{
+	switch (cmd) {
+	case LTTNG_UST_CAPTURE:
+		return "capture";
+	case LTTNG_UST_FILTER:
+		return "filter";
+	default:
+		abort();
+	}
+}
+
+static
+int handle_bytecode_recv(struct sock_info *sock_info,
+		int sock, struct ustcomm_ust_msg *lum)
+{
+	struct lttng_ust_bytecode_node *bytecode;
+	enum lttng_ust_bytecode_node_type type;
+	const struct lttng_ust_objd_ops *ops;
+	uint32_t data_size, data_size_max, reloc_offset;
+	uint64_t seqnum;
+	ssize_t len;
+	int ret = 0;
+
+	switch (lum->cmd) {
+	case LTTNG_UST_FILTER:
+		type = LTTNG_UST_BYTECODE_NODE_TYPE_FILTER;
+		data_size = lum->u.filter.data_size;
+		data_size_max = FILTER_BYTECODE_MAX_LEN;
+		reloc_offset = lum->u.filter.reloc_offset;
+		seqnum = lum->u.filter.seqnum;
+		break;
+	case LTTNG_UST_CAPTURE:
+		type = LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE;
+		data_size = lum->u.capture.data_size;
+		data_size_max = CAPTURE_BYTECODE_MAX_LEN;
+		reloc_offset = lum->u.capture.reloc_offset;
+		seqnum = lum->u.capture.seqnum;
+		break;
+	default:
+		abort();
+	}
+
+	if (data_size > data_size_max) {
+		ERR("Bytecode %s data size is too large: %u bytes",
+				bytecode_type_str(lum->cmd), data_size);
+		ret = -EINVAL;
+		goto end;
+	}
+
+	if (reloc_offset > data_size) {
+		ERR("Bytecode %s reloc offset %u is not within data",
+				bytecode_type_str(lum->cmd), reloc_offset);
+		ret = -EINVAL;
+		goto end;
+	}
+
+	/* Allocate the structure AND the `data[]` field. */
+	bytecode = zmalloc(sizeof(*bytecode) + data_size);
+	if (!bytecode) {
+		ret = -ENOMEM;
+		goto end;
+	}
+
+	bytecode->bc.len = data_size;
+	bytecode->bc.reloc_offset = reloc_offset;
+	bytecode->bc.seqnum = seqnum;
+	bytecode->type = type;
+
+	len = ustcomm_recv_unix_sock(sock, bytecode->bc.data, bytecode->bc.len);
+	switch (len) {
+	case 0:	/* orderly shutdown */
+		ret = 0;
+		goto error_free_bytecode;
+	default:
+		if (len == bytecode->bc.len) {
+			DBG("Bytecode %s data received",
+					bytecode_type_str(lum->cmd));
+			break;
+		} else if (len < 0) {
+			DBG("Receive failed from lttng-sessiond with errno %d",
+					(int) -len);
+			if (len == -ECONNRESET) {
+				ERR("%s remote end closed connection",
+						sock_info->name);
+				ret = len;
+				goto error_free_bytecode;
+			}
+			ret = len;
+			goto error_free_bytecode;
+		} else {
+			DBG("Incorrect %s bytecode data message size: %zd",
+					bytecode_type_str(lum->cmd), len);
+			ret = -EINVAL;
+			goto error_free_bytecode;
+		}
+	}
+
+	ops = objd_ops(lum->handle);
+	if (!ops) {
+		ret = -ENOENT;
+		goto error_free_bytecode;
+	}
+
+	if (ops->cmd) {
+		ret = ops->cmd(lum->handle, lum->cmd,
+			(unsigned long) bytecode,
+			NULL, sock_info);
+		if (ret)
+			goto error_free_bytecode;
+		/* don't free bytecode if everything went fine. */
+	} else {
+		ret = -ENOSYS;
+		goto error_free_bytecode;
+	}
+
+	goto end;
+
+error_free_bytecode:
+	free(bytecode);
+end:
+	return ret;
+}
+
 static
 int handle_message(struct sock_info *sock_info,
 		int sock, struct ustcomm_ust_msg *lum)
@@ -772,76 +906,12 @@ int handle_message(struct sock_info *sock_info,
 		else
 			ret = lttng_ust_objd_unref(lum->handle, 1);
 		break;
+	case LTTNG_UST_CAPTURE:
 	case LTTNG_UST_FILTER:
-	{
-		/* Receive filter data */
-		struct lttng_ust_filter_bytecode_node *bytecode;
-
-		if (lum->u.filter.data_size > FILTER_BYTECODE_MAX_LEN) {
-			ERR("Filter data size is too large: %u bytes",
-				lum->u.filter.data_size);
-			ret = -EINVAL;
-			goto error;
-		}
-
-		if (lum->u.filter.reloc_offset > lum->u.filter.data_size) {
-			ERR("Filter reloc offset %u is not within data",
-				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->bc.data,
-				lum->u.filter.data_size);
-		switch (len) {
-		case 0:	/* orderly shutdown */
-			ret = 0;
-			free(bytecode);
+		ret = handle_bytecode_recv(sock_info, sock, lum);
+		if (ret)
 			goto error;
-		default:
-			if (len == lum->u.filter.data_size) {
-				DBG("filter data received");
-				break;
-			} else if (len < 0) {
-				DBG("Receive failed from lttng-sessiond with errno %d", (int) -len);
-				if (len == -ECONNRESET) {
-					ERR("%s remote end closed connection", sock_info->name);
-					ret = len;
-					free(bytecode);
-					goto error;
-				}
-				ret = len;
-				free(bytecode);
-				goto error;
-			} else {
-				DBG("incorrect filter data message size: %zd", len);
-				ret = -EINVAL;
-				free(bytecode);
-				goto error;
-			}
-		}
-		bytecode->bc.len = lum->u.filter.data_size;
-		bytecode->bc.reloc_offset = lum->u.filter.reloc_offset;
-		bytecode->bc.seqnum = lum->u.filter.seqnum;
-		if (ops->cmd) {
-			ret = ops->cmd(lum->handle, lum->cmd,
-					(unsigned long) bytecode,
-					&args, sock_info);
-			if (ret) {
-				free(bytecode);
-			}
-			/* don't free bytecode if everything went fine. */
-		} else {
-			ret = -ENOSYS;
-			free(bytecode);
-		}
 		break;
-	}
 	case LTTNG_UST_EXCLUSION:
 	{
 		/* Receive exclusion names */
@@ -904,6 +974,47 @@ int handle_message(struct sock_info *sock_info,
 		}
 		break;
 	}
+	case LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE:
+	{
+		int event_notifier_notif_fd;
+
+		len = ustcomm_recv_event_notifier_notif_fd_from_sessiond(sock,
+			&event_notifier_notif_fd);
+		switch (len) {
+		case 0:	/* orderly shutdown */
+			ret = 0;
+			goto error;
+		case 1:
+			break;
+		default:
+			if (len < 0) {
+				DBG("Receive failed from lttng-sessiond with errno %d",
+						(int) -len);
+				if (len == -ECONNRESET) {
+					ERR("%s remote end closed connection",
+							sock_info->name);
+					ret = len;
+					goto error;
+				}
+				ret = len;
+				goto error;
+			} else {
+				DBG("Incorrect event notifier fd message size: %zd",
+						len);
+				ret = -EINVAL;
+				goto error;
+			}
+		}
+		args.event_notifier_handle.event_notifier_notif_fd =
+				event_notifier_notif_fd;
+		if (ops->cmd)
+			ret = ops->cmd(lum->handle, lum->cmd,
+					(unsigned long) &lum->u,
+					&args, sock_info);
+		else
+			ret = -ENOSYS;
+		break;
+	}
 	case LTTNG_UST_CHANNEL:
 	{
 		void *chan_data;
@@ -1171,7 +1282,7 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 	if (sock_info->wait_shm_mmap) {
 		long page_size;
 
-		page_size = sysconf(_SC_PAGE_SIZE);
+		page_size = LTTNG_UST_PAGE_SIZE;
 		if (page_size <= 0) {
 			if (!page_size) {
 				errno = EINVAL;
@@ -2063,6 +2174,7 @@ void ust_context_ns_reset(void)
 	lttng_context_mnt_ns_reset();
 	lttng_context_net_ns_reset();
 	lttng_context_user_ns_reset();
+	lttng_context_time_ns_reset();
 	lttng_context_uts_ns_reset();
 }