X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=62e1be74c1232ca31cee54c83f90df2b4bf51320;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=fb124c2a6a263300dbc13d62310e3ad701d75823;hpb=d871c65bcb2e94c69e0a46e7e0dcd2dae2fce7af;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index fb124c2a..62e1be74 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -1,24 +1,9 @@
 /*
- * lttng-ust-abi.c
- *
- * LTTng UST ABI
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ * LTTng UST ABI
  *
  * Mimic system calls for:
  * - session creation, returns an object descriptor or failure.
@@ -38,6 +23,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <fcntl.h>
 #include <stdint.h>
 #include <unistd.h>
 
@@ -55,6 +41,8 @@
 
 #include "../libringbuffer/frontend_types.h"
 #include "../libringbuffer/shm.h"
+#include "../libcounter/counter.h"
+#include "tracepoint-internal.h"
 #include "lttng-tracer.h"
 #include "string-utils.h"
 #include "ust-events-internal.h"
@@ -280,9 +268,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_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;
 
@@ -340,6 +330,50 @@ 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;
+
+	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;
+	/* Object descriptor takes ownership of notification fd. */
+	*event_notifier_notif_fd = -1;
+
+	return event_notifier_group_objd;
+
+objd_error:
+	lttng_event_notifier_group_destroy(event_notifier_group);
+fd_error:
+	return ret;
+}
+
 static
 long lttng_abi_add_context(int objd,
 	struct lttng_ust_context *context_param,
@@ -387,8 +421,11 @@ long lttng_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_TRACEPOINT_FIELD_LIST:
 		return lttng_abi_tracepoint_field_list(owner);
 	case LTTNG_UST_WAIT_QUIESCENT:
-		synchronize_trace();
+		lttng_ust_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;
 	}
@@ -398,6 +435,7 @@ static const struct lttng_ust_objd_ops lttng_ops = {
 	.cmd = lttng_cmd,
 };
 
+static
 int lttng_abi_map_channel(int session_objd,
 		struct lttng_ust_channel *ust_chan,
 		union ust_args *uargs,
@@ -442,6 +480,10 @@ int lttng_abi_map_channel(int session_objd,
 		goto handle_error;
 	}
 
+	/* Ownership of chan_data and wakeup_fd taken by channel handle. */
+	uargs->channel.chan_data = NULL;
+	uargs->channel.wakeup_fd = -1;
+
 	chan = shmp(channel_handle, channel_handle->chan);
 	assert(chan);
 	chan->handle = channel_handle;
@@ -525,24 +567,9 @@ 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;
 }
 
@@ -584,6 +611,11 @@ long lttng_session_cmd(int objd, unsigned int cmd, unsigned long arg,
 		return lttng_session_disable(session);
 	case LTTNG_UST_SESSION_STATEDUMP:
 		return lttng_session_statedump(session);
+	case LTTNG_UST_COUNTER:
+	case LTTNG_UST_COUNTER_GLOBAL:
+	case LTTNG_UST_COUNTER_CPU:
+		/* Not implemented yet. */
+		return -EINVAL;
 	default:
 		return -EINVAL;
 	}
@@ -615,6 +647,277 @@ 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_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_CAPTURE:
+		return lttng_event_notifier_enabler_attach_capture_bytecode(
+			event_notifier_enabler,
+			(struct lttng_ust_bytecode_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;
+	}
+}
+
+/**
+ *	lttng_event_notifier_group_error_counter_cmd - lttng event_notifier group error counter object command
+ *
+ *	@obj: the object
+ *	@cmd: the command
+ *	@arg: command arg
+ *	@uargs: UST arguments (internal)
+ *	@owner: objd owner
+ *
+ *	This descriptor implements lttng commands:
+ *      LTTNG_UST_COUNTER_GLOBAL
+ *        Return negative error code on error, 0 on success.
+ *      LTTNG_UST_COUNTER_CPU
+ *        Return negative error code on error, 0 on success.
+ */
+static
+long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, unsigned long arg,
+	union ust_args *uargs, void *owner)
+{
+	struct lttng_counter *counter = objd_private(objd);
+
+	switch (cmd) {
+	case LTTNG_UST_COUNTER_GLOBAL:
+		return -EINVAL;		/* Unimplemented. */
+	case LTTNG_UST_COUNTER_CPU:
+	{
+		struct lttng_ust_counter_cpu *counter_cpu =
+			(struct lttng_ust_counter_cpu *)arg;
+		return lttng_counter_set_cpu_shm(counter->counter,
+			counter_cpu->cpu_nr, uargs->counter_shm.shm_fd);
+	}
+	default:
+		return -EINVAL;
+	}
+}
+
+LTTNG_HIDDEN
+int lttng_release_event_notifier_group_error_counter(int objd)
+{
+	struct lttng_counter *counter = objd_private(objd);
+
+	if (counter) {
+		return lttng_ust_objd_unref(counter->event_notifier_group->objd, 0);
+	} else {
+		return -EINVAL;
+	}
+}
+
+static const struct lttng_ust_objd_ops lttng_event_notifier_group_error_counter_ops = {
+	.release = lttng_release_event_notifier_group_error_counter,
+	.cmd = lttng_event_notifier_group_error_counter_cmd,
+};
+
+static
+int lttng_ust_event_notifier_group_create_error_counter(int event_notifier_group_objd, void *owner,
+		struct lttng_ust_counter_conf *error_counter_conf)
+{
+	const char *counter_transport_name;
+	struct lttng_event_notifier_group *event_notifier_group =
+		objd_private(event_notifier_group_objd);
+	struct lttng_counter *counter;
+	int counter_objd, ret;
+	struct lttng_counter_dimension dimensions[1];
+	size_t counter_len;
+
+	if (event_notifier_group->error_counter)
+		return -EBUSY;
+
+	if (error_counter_conf->arithmetic != LTTNG_UST_COUNTER_ARITHMETIC_MODULAR)
+		return -EINVAL;
+
+	if (error_counter_conf->number_dimensions != 1)
+		return -EINVAL;
+
+	switch (error_counter_conf->bitness) {
+	case LTTNG_UST_COUNTER_BITNESS_64:
+		counter_transport_name = "counter-per-cpu-64-modular";
+		break;
+	case LTTNG_UST_COUNTER_BITNESS_32:
+		counter_transport_name = "counter-per-cpu-32-modular";
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	counter_objd = objd_alloc(NULL, &lttng_event_notifier_group_error_counter_ops, owner,
+		"event_notifier group error counter");
+	if (counter_objd < 0) {
+		ret = counter_objd;
+		goto objd_error;
+	}
+
+	counter_len = error_counter_conf->dimensions[0].size;
+	dimensions[0].size = counter_len;
+	dimensions[0].underflow_index = 0;
+	dimensions[0].overflow_index = 0;
+	dimensions[0].has_underflow = 0;
+	dimensions[0].has_overflow = 0;
+
+	counter = lttng_ust_counter_create(counter_transport_name, 1, dimensions);
+	if (!counter) {
+		ret = -EINVAL;
+		goto create_error;
+	}
+
+	event_notifier_group->error_counter_len = counter_len;
+	/*
+	 * store-release to publish error counter matches load-acquire
+	 * in record_error. Ensures the counter is created and the
+	 * error_counter_len is set before they are used.
+	 * Currently a full memory barrier is used, which could be
+	 * turned into acquire-release barriers.
+	 */
+	cmm_smp_mb();
+	CMM_STORE_SHARED(event_notifier_group->error_counter, counter);
+
+	counter->objd = counter_objd;
+	counter->event_notifier_group = event_notifier_group;	/* owner */
+
+	objd_set_private(counter_objd, counter);
+	/* The error counter holds a reference on the event_notifier group. */
+	objd_ref(event_notifier_group->objd);
+
+	return counter_objd;
+
+create_error:
+	{
+		int err;
+
+		err = lttng_ust_objd_unref(counter_objd, 1);
+		assert(!err);
+	}
+objd_error:
+	return ret;
+}
+
+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);
+		}
+	}
+	case LTTNG_UST_COUNTER:
+	{
+		struct lttng_ust_counter_conf *counter_conf =
+			(struct lttng_ust_counter_conf *) uargs->counter.counter_data;
+		return lttng_ust_event_notifier_group_create_error_counter(
+				objd, owner, counter_conf);
+	}
+	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)
@@ -787,6 +1090,9 @@ int lttng_abi_map_stream(int channel_objd, struct lttng_ust_stream *info,
 		info->stream_nr, info->len);
 	if (ret)
 		goto error_add_stream;
+	/* Take ownership of shm_fd and wakeup_fd. */
+	uargs->stream.shm_fd = -1;
+	uargs->stream.wakeup_fd = -1;
 
 	return 0;
 
@@ -970,8 +1276,8 @@ long lttng_event_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
 	{
 		int ret;
 
-		ret = lttng_event_enabler_attach_bytecode(enabler,
-				(struct lttng_ust_filter_bytecode_node *) arg);
+		ret = lttng_event_enabler_attach_filter_bytecode(enabler,
+				(struct lttng_ust_bytecode_node **) arg);
 		if (ret)
 			return ret;
 		return 0;
@@ -979,7 +1285,7 @@ long lttng_event_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
 	case LTTNG_UST_EXCLUSION:
 	{
 		return lttng_event_enabler_attach_exclusion(enabler,
-				(struct lttng_ust_excluder_node *) arg);
+				(struct lttng_ust_excluder_node **) arg);
 	}
 	default:
 		return -EINVAL;