X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ust-abi.c;h=718dfbf70d9469c17dcecb53ee401d6d8a8ff427;hb=80333dfa3049634097979b6504409b8bf8ba8178;hp=a024b616fe5198be022ebe6858ae6653556327a6;hpb=10544ee8af31afb239e3dfa71cb2fe09d3de3771;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c index a024b616..718dfbf7 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 * - * 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 #include -#include +#include #include #include #include @@ -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 @@ -326,8 +312,8 @@ int lttng_abi_create_session(void *owner) 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: @@ -346,10 +332,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 +344,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 +363,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; } @@ -439,11 +422,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: - 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; } @@ -453,6 +436,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, @@ -486,7 +470,7 @@ int lttng_abi_map_channel(int session_objd, goto invalid; } - if (session->been_active) { + if (session->priv->been_active) { ret = -EBUSY; goto active; /* Refuse to add channel to active session */ } @@ -497,6 +481,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; @@ -558,7 +546,7 @@ int lttng_abi_map_channel(int session_objd, 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; @@ -580,24 +568,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 +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); + (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: @@ -761,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); @@ -816,10 +801,10 @@ int lttng_ust_event_notifier_group_create_error_counter(int event_notifier_group 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: @@ -846,8 +831,16 @@ int lttng_ust_event_notifier_group_create_error_counter(int event_notifier_group goto create_error; } - event_notifier_group->error_counter = counter; 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 */ @@ -1109,6 +1102,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; @@ -1243,7 +1239,7 @@ int lttng_channel_release(int objd) 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; } @@ -1293,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; @@ -1301,7 +1297,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;