/*
- * 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.
#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>
#include "lttng-tracer.h"
#include "string-utils.h"
#include "ust-events-internal.h"
+#include "context-internal.h"
#define OBJ_NAME_LEN 16
ret = session_objd;
goto objd_error;
}
- session->objd = session_objd;
- session->owner = owner;
+ session->priv->objd = session_objd;
+ session->priv->owner = owner;
return session_objd;
objd_error:
}
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)
/*
* 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;
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;
}
case LTTNG_UST_TRACEPOINT_FIELD_LIST:
return lttng_abi_tracepoint_field_list(owner);
case LTTNG_UST_WAIT_QUIESCENT:
- lttng_ust_synchronize_trace();
+ lttng_ust_urcu_synchronize_rcu();
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;
}
.cmd = lttng_cmd,
};
+static
int lttng_abi_map_channel(int session_objd,
struct lttng_ust_channel *ust_chan,
union ust_args *uargs,
goto invalid;
}
- if (session->been_active) {
+ if (session->priv->been_active) {
ret = -EBUSY;
goto active; /* Refuse to add channel to active session */
}
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;
memcpy(<tng_chan->chan->backend.config,
transport->client_config,
sizeof(lttng_chan->chan->backend.config));
- cds_list_add(<tng_chan->node, &session->chan_head);
+ cds_list_add(<tng_chan->node, &session->priv->chan_head);
lttng_chan->header_type = 0;
lttng_chan->handle = channel_handle;
lttng_chan->type = type;
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;
}
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:
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);
return -EINVAL;
switch (error_counter_conf->bitness) {
- case LTTNG_UST_COUNTER_BITNESS_64BITS:
+ case LTTNG_UST_COUNTER_BITNESS_64:
counter_transport_name = "counter-per-cpu-64-modular";
break;
- case LTTNG_UST_COUNTER_BITNESS_32BITS:
+ case LTTNG_UST_COUNTER_BITNESS_32:
counter_transport_name = "counter-per-cpu-32-modular";
break;
default:
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;
struct lttng_channel *channel = objd_private(objd);
if (channel)
- return lttng_ust_objd_unref(channel->session->objd, 0);
+ return lttng_ust_objd_unref(channel->session->priv->objd, 0);
return 0;
}
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;
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;