Move to kernel style SPDX license identifiers

[lttng-ust.git] / liblttng-ust / lttng-ust-abi.c

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index b35065996815a1cc3c8fd56aac47a6f6471018e6..62e1be74c1232ca31cee54c83f90df2b4bf51320 100644 (file)
--- 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.
@@ -346,10 +331,10 @@ long lttng_abi_tracer_version(int objd,
 }
 
 static
-int lttng_abi_event_notifier_send_fd(void *owner, int event_notifier_notif_fd)
+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;
+       int event_notifier_group_objd, ret, fd_flag;
 
        event_notifier_group = lttng_event_notifier_group_create();
        if (!event_notifier_group)
@@ -358,11 +343,11 @@ int lttng_abi_event_notifier_send_fd(void *owner, int event_notifier_notif_fd)
        /*
         * Set this file descriptor as NON-BLOCKING.
         */
-       fd_flag = fcntl(event_notifier_notif_fd, F_GETFL);
+       fd_flag = fcntl(*event_notifier_notif_fd, F_GETFL);
 
        fd_flag |= O_NONBLOCK;
 
-       ret = fcntl(event_notifier_notif_fd, F_SETFL, fd_flag);
+       ret = fcntl(*event_notifier_notif_fd, F_SETFL, fd_flag);
        if (ret) {
                ret = -errno;
                goto fd_error;
@@ -377,18 +362,15 @@ int lttng_abi_event_notifier_send_fd(void *owner, int event_notifier_notif_fd)
 
        event_notifier_group->objd = event_notifier_group_objd;
        event_notifier_group->owner = owner;
-       event_notifier_group->notification_fd = event_notifier_notif_fd;
+       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:
-       close_ret = close(event_notifier_notif_fd);
-       if (close_ret) {
-               PERROR("close");
-       }
-
        return ret;
 }
 
@@ -443,7 +425,7 @@ long lttng_cmd(int objd, unsigned int cmd, unsigned long arg,
                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);
+                       &uargs->event_notifier_handle.event_notifier_notif_fd);
        default:
                return -EINVAL;
        }
@@ -453,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,
@@ -497,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;
@@ -580,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;
 }
 
@@ -725,14 +697,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);
+                       (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:
@@ -778,6 +750,7 @@ long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, un
        }
 }
 
+LTTNG_HIDDEN
 int lttng_release_event_notifier_group_error_counter(int objd)
 {
        struct lttng_counter *counter = objd_private(objd);
@@ -1117,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;
 
@@ -1301,7 +1277,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;
@@ -1309,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;