X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=1361f5cc0cb6e4b7939c5f03ba6676195c34e9a1;hb=a56fd376c76b448c9f639b8ace821471a2fb7b40;hp=70ec22aa1ac8362ad244ed1c92caa3d032bcb244;hpb=1849ef7cdc349bef4b6f6eb4a50058e06c26d431;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 70ec22aa..1361f5cc 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -37,19 +37,28 @@
  *     - Takes instrumentation source specific arguments.
  */
 
-#include <lttng/ust-abi.h>
-#include <lttng/ust-error.h>
+#define _LGPL_SOURCE
+#include <fcntl.h>
+#include <stdint.h>
+#include <unistd.h>
+
 #include <urcu/compiler.h>
 #include <urcu/list.h>
+
+#include <helper.h>
+#include <lttng/tracepoint.h>
+#include <lttng/ust-abi.h>
+#include <lttng/ust-error.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-version.h>
-#include <lttng/tracepoint.h>
-#include "tracepoint-internal.h"
+#include <ust-fd.h>
 #include <usterr-signal-safe.h>
-#include <helper.h>
-#include "lttng-tracer.h"
-#include "../libringbuffer/shm.h"
+
 #include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/shm.h"
+#include "lttng-tracer.h"
+#include "string-utils.h"
+#include "ust-events-internal.h"
 
 #define OBJ_NAME_LEN	16
 
@@ -185,6 +194,7 @@ static
 void objd_ref(int id)
 {
 	struct lttng_ust_obj *obj = _objd_get(id);
+	assert(obj != NULL);
 	obj->u.s.f_count++;
 }
 
@@ -207,7 +217,7 @@ int lttng_ust_objd_unref(int id, int is_owner)
 	}
 	if ((--obj->u.s.f_count) == 1) {
 		const struct lttng_ust_objd_ops *ops = objd_ops(id);
-		
+
 		if (ops->release)
 			ops->release(id);
 		objd_free(id);
@@ -271,9 +281,11 @@ void lttng_ust_objd_table_owner_cleanup(void *owner)
  */
 
 static const struct lttng_ust_objd_ops lttng_ops;
+static const struct lttng_ust_objd_ops lttng_event_notifier_group_ops;
 static const struct lttng_ust_objd_ops lttng_session_ops;
 static const struct lttng_ust_objd_ops lttng_channel_ops;
-static const struct lttng_ust_objd_ops lttng_enabler_ops;
+static const struct lttng_ust_objd_ops lttng_event_enabler_ops;
+static const struct lttng_ust_objd_ops lttng_event_notifier_enabler_ops;
 static const struct lttng_ust_objd_ops lttng_tracepoint_list_ops;
 static const struct lttng_ust_objd_ops lttng_tracepoint_field_list_ops;
 
@@ -331,12 +343,60 @@ long lttng_abi_tracer_version(int objd,
 	return 0;
 }
 
+static
+int lttng_abi_event_notifier_send_fd(void *owner, int event_notifier_notif_fd)
+{
+	struct lttng_event_notifier_group *event_notifier_group;
+	int event_notifier_group_objd, ret, fd_flag, close_ret;
+
+	event_notifier_group = lttng_event_notifier_group_create();
+	if (!event_notifier_group)
+		return -ENOMEM;
+
+	/*
+	 * Set this file descriptor as NON-BLOCKING.
+	 */
+	fd_flag = fcntl(event_notifier_notif_fd, F_GETFL);
+
+	fd_flag |= O_NONBLOCK;
+
+	ret = fcntl(event_notifier_notif_fd, F_SETFL, fd_flag);
+	if (ret) {
+		ret = -errno;
+		goto fd_error;
+	}
+
+	event_notifier_group_objd = objd_alloc(event_notifier_group,
+		&lttng_event_notifier_group_ops, owner, "event_notifier_group");
+	if (event_notifier_group_objd < 0) {
+		ret = event_notifier_group_objd;
+		goto objd_error;
+	}
+
+	event_notifier_group->objd = event_notifier_group_objd;
+	event_notifier_group->owner = owner;
+	event_notifier_group->notification_fd = event_notifier_notif_fd;
+
+	return event_notifier_group_objd;
+
+objd_error:
+	lttng_event_notifier_group_destroy(event_notifier_group);
+fd_error:
+	close_ret = close(event_notifier_notif_fd);
+	if (close_ret) {
+		PERROR("close");
+	}
+
+	return ret;
+}
+
 static
 long lttng_abi_add_context(int objd,
 	struct lttng_ust_context *context_param,
+	union ust_args *uargs,
 	struct lttng_ctx **ctx, struct lttng_session *session)
 {
-	return lttng_attach_context(context_param, ctx, session);
+	return lttng_attach_context(context_param, uargs, ctx, session);
 }
 
 /**
@@ -379,6 +439,9 @@ long lttng_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_WAIT_QUIESCENT:
 		synchronize_trace();
 		return 0;
+	case LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE:
+		return lttng_abi_event_notifier_send_fd(owner,
+			uargs->event_notifier_handle.event_notifier_notif_fd);
 	default:
 		return -EINVAL;
 	}
@@ -403,11 +466,13 @@ int lttng_abi_map_channel(int session_objd,
 	struct channel *chan;
 	struct lttng_ust_lib_ring_buffer_config *config;
 	void *chan_data;
+	int wakeup_fd;
 	uint64_t len;
 	int ret;
 	enum lttng_ust_chan_type type;
 
 	chan_data = uargs->channel.chan_data;
+	wakeup_fd = uargs->channel.wakeup_fd;
 	len = ust_chan->len;
 	type = ust_chan->type;
 
@@ -415,7 +480,8 @@ int lttng_abi_map_channel(int session_objd,
 	case LTTNG_UST_CHAN_PER_CPU:
 		break;
 	default:
-		return -EINVAL;
+		ret = -EINVAL;
+		goto invalid;
 	}
 
 	if (session->been_active) {
@@ -423,7 +489,7 @@ int lttng_abi_map_channel(int session_objd,
 		goto active;	/* Refuse to add channel to active session */
 	}
 
-	channel_handle = channel_handle_create(chan_data, len);
+	channel_handle = channel_handle_create(chan_data, len, wakeup_fd);
 	if (!channel_handle) {
 		ret = -EINVAL;
 		goto handle_error;
@@ -443,8 +509,19 @@ int lttng_abi_map_channel(int session_objd,
 	switch (type) {
 	case LTTNG_UST_CHAN_PER_CPU:
 		if (config->output == RING_BUFFER_MMAP) {
-			transport_name = config->mode == RING_BUFFER_OVERWRITE ?
-				"relay-overwrite-mmap" : "relay-discard-mmap";
+			if (config->mode == RING_BUFFER_OVERWRITE) {
+				if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) {
+					transport_name = "relay-overwrite-mmap";
+				} else {
+					transport_name = "relay-overwrite-rt-mmap";
+				}
+			} else {
+				if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) {
+					transport_name = "relay-discard-mmap";
+				} else {
+					transport_name = "relay-discard-rt-mmap";
+				}
+			}
 		} else {
 			ret = -EINVAL;
 			goto notransport;
@@ -452,8 +529,6 @@ int lttng_abi_map_channel(int session_objd,
 		chan_name = "channel";
 		break;
 	default:
-		transport_name = "<unknown>";
-		chan_name = "<unknown>";
 		ret = -EINVAL;
 		goto notransport;
 	}
@@ -496,13 +571,31 @@ int lttng_abi_map_channel(int session_objd,
 	objd_ref(session_objd);
 	return chan_objd;
 
+	/* error path after channel was created */
 objd_error:
 notransport:
-	free(lttng_chan);
 alloc_error:
 	channel_destroy(chan, channel_handle, 0);
+	return ret;
+
+	/*
+	 * error path before channel creation (owning chan_data and
+	 * wakeup_fd).
+	 */
 handle_error:
 active:
+invalid:
+	{
+		int close_ret;
+
+		lttng_ust_lock_fd_tracker();
+		close_ret = close(wakeup_fd);
+		lttng_ust_unlock_fd_tracker();
+		if (close_ret) {
+			PERROR("close");
+		}
+	}
+	free(chan_data);
 	return ret;
 }
 
@@ -542,6 +635,8 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_SESSION_STOP:
 	case LTTNG_UST_DISABLE:
 		return lttng_session_disable(session);
+	case LTTNG_UST_SESSION_STATEDUMP:
+		return lttng_session_statedump(session);
 	default:
 		return -EINVAL;
 	}
@@ -573,6 +668,130 @@ static const struct lttng_ust_objd_ops lttng_session_ops = {
 	.cmd = lttng_session_cmd,
 };
 
+static int lttng_ust_event_notifier_enabler_create(int event_notifier_group_obj,
+		void *owner, struct lttng_ust_event_notifier *event_notifier_param,
+		enum lttng_enabler_format_type type)
+{
+	struct lttng_event_notifier_group *event_notifier_group =
+		objd_private(event_notifier_group_obj);
+	struct lttng_event_notifier_enabler *event_notifier_enabler;
+	int event_notifier_objd, ret;
+
+	event_notifier_param->event.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
+	event_notifier_objd = objd_alloc(NULL, &lttng_event_notifier_enabler_ops, owner,
+		"event_notifier enabler");
+	if (event_notifier_objd < 0) {
+		ret = event_notifier_objd;
+		goto objd_error;
+	}
+
+	event_notifier_enabler = lttng_event_notifier_enabler_create(
+		event_notifier_group, type, event_notifier_param);
+	if (!event_notifier_enabler) {
+		ret = -ENOMEM;
+		goto event_notifier_error;
+	}
+
+	objd_set_private(event_notifier_objd, event_notifier_enabler);
+	/* The event_notifier holds a reference on the event_notifier group. */
+	objd_ref(event_notifier_enabler->group->objd);
+
+	return event_notifier_objd;
+
+event_notifier_error:
+	{
+		int err;
+
+		err = lttng_ust_objd_unref(event_notifier_objd, 1);
+		assert(!err);
+	}
+objd_error:
+	return ret;
+}
+
+static
+long lttng_event_notifier_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
+		union ust_args *uargs, void *owner)
+{
+	struct lttng_event_notifier_enabler *event_notifier_enabler = objd_private(objd);
+	switch (cmd) {
+	case LTTNG_UST_FILTER:
+		return lttng_event_notifier_enabler_attach_filter_bytecode(
+			event_notifier_enabler,
+			(struct lttng_ust_filter_bytecode_node *) arg);
+	case LTTNG_UST_EXCLUSION:
+		return lttng_event_notifier_enabler_attach_exclusion(event_notifier_enabler,
+			(struct lttng_ust_excluder_node *) arg);
+	case LTTNG_UST_ENABLE:
+		return lttng_event_notifier_enabler_enable(event_notifier_enabler);
+	case LTTNG_UST_DISABLE:
+		return lttng_event_notifier_enabler_disable(event_notifier_enabler);
+	default:
+		return -EINVAL;
+	}
+}
+
+static
+long lttng_event_notifier_group_cmd(int objd, unsigned int cmd, unsigned long arg,
+		union ust_args *uargs, void *owner)
+{
+	switch (cmd) {
+	case LTTNG_UST_EVENT_NOTIFIER_CREATE:
+	{
+		struct lttng_ust_event_notifier *event_notifier_param =
+			(struct lttng_ust_event_notifier *) arg;
+		if (strutils_is_star_glob_pattern(event_notifier_param->event.name)) {
+			/*
+			 * If the event name is a star globbing pattern,
+			 * we create the special star globbing enabler.
+			 */
+			return lttng_ust_event_notifier_enabler_create(objd,
+					owner, event_notifier_param,
+					LTTNG_ENABLER_FORMAT_STAR_GLOB);
+		} else {
+			return lttng_ust_event_notifier_enabler_create(objd,
+					owner, event_notifier_param,
+					LTTNG_ENABLER_FORMAT_EVENT);
+		}
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
+static
+int lttng_event_notifier_enabler_release(int objd)
+{
+	struct lttng_event_notifier_enabler *event_notifier_enabler = objd_private(objd);
+
+	if (event_notifier_enabler)
+		return lttng_ust_objd_unref(event_notifier_enabler->group->objd, 0);
+	return 0;
+}
+
+static const struct lttng_ust_objd_ops lttng_event_notifier_enabler_ops = {
+	.release = lttng_event_notifier_enabler_release,
+	.cmd = lttng_event_notifier_enabler_cmd,
+};
+
+static
+int lttng_release_event_notifier_group(int objd)
+{
+	struct lttng_event_notifier_group *event_notifier_group = objd_private(objd);
+
+	if (event_notifier_group) {
+		lttng_event_notifier_group_destroy(event_notifier_group);
+		return 0;
+	} else {
+		return -EINVAL;
+	}
+}
+
+static const struct lttng_ust_objd_ops lttng_event_notifier_group_ops = {
+	.release = lttng_release_event_notifier_group,
+	.cmd = lttng_event_notifier_group_cmd,
+};
+
 static
 long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg,
 	union ust_args *uargs, void *owner)
@@ -753,17 +972,18 @@ error_add_stream:
 }
 
 static
-int lttng_abi_create_enabler(int channel_objd,
+int lttng_abi_create_event_enabler(int channel_objd,
 			   struct lttng_ust_event *event_param,
 			   void *owner,
-			   enum lttng_enabler_type type)
+			   enum lttng_enabler_format_type format_type)
 {
 	struct lttng_channel *channel = objd_private(channel_objd);
-	struct lttng_enabler *enabler;
+	struct lttng_event_enabler *enabler;
 	int event_objd, ret;
 
 	event_param->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
-	event_objd = objd_alloc(NULL, &lttng_enabler_ops, owner, "enabler");
+	event_objd = objd_alloc(NULL, &lttng_event_enabler_ops, owner,
+		"event enabler");
 	if (event_objd < 0) {
 		ret = event_objd;
 		goto objd_error;
@@ -772,7 +992,7 @@ int lttng_abi_create_enabler(int channel_objd,
 	 * We tolerate no failure path after event creation. It will stay
 	 * invariant for the rest of the session.
 	 */
-	enabler = lttng_enabler_create(type, event_param, channel);
+	enabler = lttng_event_enabler_create(format_type, event_param, channel);
 	if (!enabler) {
 		ret = -ENOMEM;
 		goto event_error;
@@ -844,18 +1064,22 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg,
 	{
 		struct lttng_ust_event *event_param =
 			(struct lttng_ust_event *) arg;
-		if (event_param->name[strlen(event_param->name) - 1] == '*') {
-			/* If ends with wildcard, create wildcard. */
-			return lttng_abi_create_enabler(objd, event_param,
-					owner, LTTNG_ENABLER_WILDCARD);
+
+		if (strutils_is_star_glob_pattern(event_param->name)) {
+			/*
+			 * If the event name is a star globbing pattern,
+			 * we create the special star globbing enabler.
+			 */
+			return lttng_abi_create_event_enabler(objd, event_param,
+					owner, LTTNG_ENABLER_FORMAT_STAR_GLOB);
 		} else {
-			return lttng_abi_create_enabler(objd, event_param,
-					owner, LTTNG_ENABLER_EVENT);
+			return lttng_abi_create_event_enabler(objd, event_param,
+					owner, LTTNG_ENABLER_FORMAT_EVENT);
 		}
 	}
 	case LTTNG_UST_CONTEXT:
 		return lttng_abi_add_context(objd,
-				(struct lttng_ust_context *) arg,
+				(struct lttng_ust_context *) arg, uargs,
 				&channel->ctx, channel->session);
 	case LTTNG_UST_ENABLE:
 		return lttng_channel_enable(channel);
@@ -902,54 +1126,64 @@ static const struct lttng_ust_objd_ops lttng_channel_ops = {
  *		Disable recording for this enabler
  *	LTTNG_UST_FILTER
  *		Attach a filter to an enabler.
+ *	LTTNG_UST_EXCLUSION
+ *		Attach exclusions to an enabler.
  */
 static
-long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
+long lttng_event_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
 	union ust_args *uargs, void *owner)
 {
-	struct lttng_enabler *enabler = objd_private(objd);
+	struct lttng_event_enabler *enabler = objd_private(objd);
 
 	switch (cmd) {
 	case LTTNG_UST_CONTEXT:
-		return lttng_enabler_attach_context(enabler,
+		return lttng_event_enabler_attach_context(enabler,
 				(struct lttng_ust_context *) arg);
 	case LTTNG_UST_ENABLE:
-		return lttng_enabler_enable(enabler);
+		return lttng_event_enabler_enable(enabler);
 	case LTTNG_UST_DISABLE:
-		return lttng_enabler_disable(enabler);
+		return lttng_event_enabler_disable(enabler);
 	case LTTNG_UST_FILTER:
 	{
 		int ret;
 
-		ret = lttng_enabler_attach_bytecode(enabler,
+		ret = lttng_event_enabler_attach_filter_bytecode(enabler,
 				(struct lttng_ust_filter_bytecode_node *) arg);
 		if (ret)
 			return ret;
 		return 0;
 	}
+	case LTTNG_UST_EXCLUSION:
+	{
+		return lttng_event_enabler_attach_exclusion(enabler,
+				(struct lttng_ust_excluder_node *) arg);
+	}
 	default:
 		return -EINVAL;
 	}
 }
 
 static
-int lttng_enabler_release(int objd)
+int lttng_event_enabler_release(int objd)
 {
-	struct lttng_enabler *enabler = objd_private(objd);
+	struct lttng_event_enabler *event_enabler = objd_private(objd);
+
+	if (event_enabler)
+		return lttng_ust_objd_unref(event_enabler->chan->objd, 0);
 
-	if (enabler)
-		return lttng_ust_objd_unref(enabler->chan->objd, 0);
 	return 0;
 }
 
-static const struct lttng_ust_objd_ops lttng_enabler_ops = {
-	.release = lttng_enabler_release,
-	.cmd = lttng_enabler_cmd,
+static const struct lttng_ust_objd_ops lttng_event_enabler_ops = {
+	.release = lttng_event_enabler_release,
+	.cmd = lttng_event_enabler_cmd,
 };
 
 void lttng_ust_abi_exit(void)
 {
 	lttng_ust_abi_close_in_progress = 1;
+	ust_lock_nocheck();
 	objd_table_destroy();
+	ust_unlock();
 	lttng_ust_abi_close_in_progress = 0;
 }