X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ust-abi.c;h=10d5bcbe4fc78be19a7da2c1596a2360a897d7d5;hb=8665f6a432525473b9dcba296394e68a8f49d9f2;hp=5063ec6c7c1b14d981ce8fed0ea4d222631cd6cf;hpb=e9fe6aad66010614f987e917866837706d19053b;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 5063ec6c..10d5bcbe 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.
@@ -45,7 +30,7 @@
 #include <urcu/compiler.h>
 #include <urcu/list.h>
 
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/tracepoint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
@@ -61,6 +46,7 @@
 #include "lttng-tracer.h"
 #include "string-utils.h"
 #include "ust-events-internal.h"
+#include "context-internal.h"
 
 #define OBJ_NAME_LEN	16
 
@@ -712,14 +698,14 @@ long lttng_event_notifier_enabler_cmd(int objd, unsigned int cmd, unsigned long
 	case LTTNG_UST_FILTER:
 		return lttng_event_notifier_enabler_attach_filter_bytecode(
 			event_notifier_enabler,
-			(struct lttng_ust_bytecode_node *) arg);
+			(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);
+			(struct lttng_ust_bytecode_node **) arg);
 	case LTTNG_UST_ENABLE:
 		return lttng_event_notifier_enabler_enable(event_notifier_enabler);
 	case LTTNG_UST_DISABLE:
@@ -748,23 +734,35 @@ static
 long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, unsigned long arg,
 	union ust_args *uargs, void *owner)
 {
+	int ret;
 	struct lttng_counter *counter = objd_private(objd);
 
 	switch (cmd) {
 	case LTTNG_UST_COUNTER_GLOBAL:
-		return -EINVAL;		/* Unimplemented. */
+		ret = -EINVAL;	/* Unimplemented. */
+		break;
 	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,
+
+		ret = lttng_counter_set_cpu_shm(counter->counter,
 			counter_cpu->cpu_nr, uargs->counter_shm.shm_fd);
+		if (!ret) {
+			/* Take ownership of the shm_fd. */
+			uargs->counter_shm.shm_fd = -1;
+		}
+		break;
 	}
 	default:
-		return -EINVAL;
+		ret = -EINVAL;
+		break;
 	}
+
+	return ret;
 }
 
+LTTNG_HIDDEN
 int lttng_release_event_notifier_group_error_counter(int objd)
 {
 	struct lttng_counter *counter = objd_private(objd);
@@ -1291,7 +1289,7 @@ long lttng_event_enabler_cmd(int objd, unsigned int cmd, unsigned long arg,
 		int ret;
 
 		ret = lttng_event_enabler_attach_filter_bytecode(enabler,
-				(struct lttng_ust_bytecode_node *) arg);
+				(struct lttng_ust_bytecode_node **) arg);
 		if (ret)
 			return ret;
 		return 0;