X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ust-abi.c;h=1bf7a5aeab03a84b09c05dda0fdfe9ab8b7ead97;hb=fd46f5c79a6a7178e35ce4f8ea21caa30da45cc4;hp=ac59d15a44bd3ecab5e7906d148114ab8c7b8561;hpb=3fbec7dc3645facd9e809cf161ba3435a377ce56;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c index ac59d15a..1bf7a5ae 100644 --- a/liblttng-ust/lttng-ust-abi.c +++ b/liblttng-ust/lttng-ust-abi.c @@ -45,10 +45,12 @@ #include #include #include +#include #include "tracepoint-internal.h" #include #include #include "lttng-tracer.h" +#include "string-utils.h" #include "../libringbuffer/shm.h" #include "../libringbuffer/frontend_types.h" @@ -209,7 +211,7 @@ int lttng_ust_objd_unref(int id, int is_owner) } if ((--obj->u.s.f_count) == 1) { const struct lttng_ust_objd_ops *ops = objd_ops(id); - + if (ops->release) ops->release(id); objd_free(id); @@ -391,6 +393,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, @@ -435,6 +438,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; @@ -518,22 +525,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; - - close_ret = close(wakeup_fd); - if (close_ret) { - PERROR("close"); - } - } - free(chan_data); return ret; } @@ -778,6 +772,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; @@ -877,10 +874,14 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg, { struct lttng_ust_event *event_param = (struct lttng_ust_event *) arg; - if (event_param->name[strlen(event_param->name) - 1] == '*') { - /* If ends with wildcard, create wildcard. */ + + if (strutils_is_star_glob_pattern(event_param->name)) { + /* + * If the event name is a star globbing pattern, + * we create the special star globbing enabler. + */ return lttng_abi_create_enabler(objd, event_param, - owner, LTTNG_ENABLER_WILDCARD); + owner, LTTNG_ENABLER_STAR_GLOB); } else { return lttng_abi_create_enabler(objd, event_param, owner, LTTNG_ENABLER_EVENT);