X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=c06f69dca5a0982d28ed00e45fadd0ea5ae4446c;hb=5eb6aa636c888dd0c6907db2d559d236eb3c9de5;hp=006e996264f8964e38f67038dec09d1d508be19f;hpb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c index 006e9962..c06f69dc 100644 --- a/liblttng-ust/lttng-ust-abi.c +++ b/liblttng-ust/lttng-ust-abi.c @@ -71,6 +71,7 @@ struct lttng_ust_obj { void *private_data; const struct lttng_ust_objd_ops *ops; int f_count; + int owner_ref; /* has ref from owner */ void *owner; char name[OBJ_NAME_LEN]; } s; @@ -126,6 +127,7 @@ end: obj->u.s.ops = ops; obj->u.s.f_count = 2; /* count == 1 : object is allocated */ /* count == 2 : allocated + hold ref */ + obj->u.s.owner_ref = 1; /* One owner reference */ obj->u.s.owner = owner; strncpy(obj->u.s.name, name, OBJ_NAME_LEN); obj->u.s.name[OBJ_NAME_LEN - 1] = '\0'; @@ -183,10 +185,11 @@ static void objd_ref(int id) { struct lttng_ust_obj *obj = _objd_get(id); + assert(obj != NULL); obj->u.s.f_count++; } -int lttng_ust_objd_unref(int id) +int lttng_ust_objd_unref(int id, int is_owner) { struct lttng_ust_obj *obj = _objd_get(id); @@ -196,6 +199,13 @@ int lttng_ust_objd_unref(int id) ERR("Reference counting error\n"); return -EINVAL; } + if (is_owner) { + if (!obj->u.s.owner_ref) { + ERR("Error decrementing owner reference"); + return -EINVAL; + } + obj->u.s.owner_ref--; + } if ((--obj->u.s.f_count) == 1) { const struct lttng_ust_objd_ops *ops = objd_ops(id); @@ -211,8 +221,16 @@ void objd_table_destroy(void) { int i; - for (i = 0; i < objd_table.allocated_len; i++) - (void) lttng_ust_objd_unref(i); + for (i = 0; i < objd_table.allocated_len; i++) { + struct lttng_ust_obj *obj; + + obj = _objd_get(i); + if (!obj) + continue; + if (!obj->u.s.owner_ref) + continue; /* only unref owner ref. */ + (void) lttng_ust_objd_unref(i, 1); + } free(objd_table.array); objd_table.array = NULL; objd_table.len = 0; @@ -241,8 +259,10 @@ void lttng_ust_objd_table_owner_cleanup(void *owner) continue; if (!obj->u.s.owner) continue; /* skip root handles */ + if (!obj->u.s.owner_ref) + continue; /* only unref owner ref. */ if (obj->u.s.owner == owner) - (void) lttng_ust_objd_unref(i); + (void) lttng_ust_objd_unref(i, 1); } } @@ -294,6 +314,7 @@ int lttng_abi_create_session(void *owner) goto objd_error; } session->objd = session_objd; + session->owner = owner; return session_objd; objd_error: @@ -305,9 +326,9 @@ static long lttng_abi_tracer_version(int objd, struct lttng_ust_tracer_version *v) { - v->major = LTTNG_UST_INTERNAL_MAJOR_VERSION; - v->minor = LTTNG_UST_INTERNAL_MINOR_VERSION; - v->patchlevel = LTTNG_UST_INTERNAL_PATCHLEVEL_VERSION; + v->major = LTTNG_UST_MAJOR_VERSION; + v->minor = LTTNG_UST_MINOR_VERSION; + v->patchlevel = LTTNG_UST_PATCHLEVEL_VERSION; return 0; } @@ -368,39 +389,6 @@ static const struct lttng_ust_objd_ops lttng_ops = { .cmd = lttng_cmd, }; -/* - * We tolerate no failure in this function (if one happens, we print a dmesg - * error, but cannot return any error, because the channel information is - * invariant. - */ -static -void lttng_metadata_create_events(int channel_objd) -{ - struct lttng_channel *chan = objd_private(channel_objd); - struct lttng_enabler *enabler; - static struct lttng_ust_event metadata_params = { - .instrumentation = LTTNG_UST_TRACEPOINT, - .name = "lttng_ust:metadata", - .loglevel_type = LTTNG_UST_LOGLEVEL_ALL, - .loglevel = TRACE_DEFAULT, - }; - - /* - * We tolerate no failure path after event creation. It will stay - * invariant for the rest of the session. - */ - enabler = lttng_enabler_create(LTTNG_ENABLER_EVENT, - &metadata_params, chan); - if (!enabler) { - goto create_error; - } - return; - -create_error: - WARN_ON(1); - return; /* not allowed to return error */ -} - int lttng_abi_map_channel(int session_objd, struct lttng_ust_channel *ust_chan, union ust_args *uargs, @@ -416,20 +404,22 @@ int lttng_abi_map_channel(int session_objd, struct channel *chan; struct lttng_ust_lib_ring_buffer_config *config; void *chan_data; + int wakeup_fd; uint64_t len; int ret; enum lttng_ust_chan_type type; chan_data = uargs->channel.chan_data; + wakeup_fd = uargs->channel.wakeup_fd; len = ust_chan->len; type = ust_chan->type; switch (type) { case LTTNG_UST_CHAN_PER_CPU: - case LTTNG_UST_CHAN_METADATA: break; default: - return -EINVAL; + ret = -EINVAL; + goto invalid; } if (session->been_active) { @@ -437,7 +427,7 @@ int lttng_abi_map_channel(int session_objd, goto active; /* Refuse to add channel to active session */ } - channel_handle = channel_handle_create(chan_data, len); + channel_handle = channel_handle_create(chan_data, len, wakeup_fd); if (!channel_handle) { ret = -EINVAL; goto handle_error; @@ -445,6 +435,7 @@ int lttng_abi_map_channel(int session_objd, chan = shmp(channel_handle, channel_handle->chan); assert(chan); + chan->handle = channel_handle; config = &chan->backend.config; lttng_chan = channel_get_private(chan); if (!lttng_chan) { @@ -456,23 +447,25 @@ int lttng_abi_map_channel(int session_objd, switch (type) { case LTTNG_UST_CHAN_PER_CPU: if (config->output == RING_BUFFER_MMAP) { - transport_name = config->mode == RING_BUFFER_OVERWRITE ? - "relay-overwrite-mmap" : "relay-discard-mmap"; + if (config->mode == RING_BUFFER_OVERWRITE) { + if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) { + transport_name = "relay-overwrite-mmap"; + } else { + transport_name = "relay-overwrite-rt-mmap"; + } + } else { + if (config->wakeup == RING_BUFFER_WAKEUP_BY_WRITER) { + transport_name = "relay-discard-mmap"; + } else { + transport_name = "relay-discard-rt-mmap"; + } + } } else { ret = -EINVAL; goto notransport; } chan_name = "channel"; break; - case LTTNG_UST_CHAN_METADATA: - if (config->output == RING_BUFFER_MMAP) { - transport_name = "relay-metadata-mmap"; - } else { - ret = -EINVAL; - goto notransport; - } - chan_name = "metadata"; - break; default: transport_name = ""; chan_name = ""; @@ -495,11 +488,10 @@ int lttng_abi_map_channel(int session_objd, /* Initialize our lttng chan */ lttng_chan->chan = chan; + lttng_chan->tstate = 1; lttng_chan->enabled = 1; lttng_chan->ctx = NULL; lttng_chan->session = session; - lttng_chan->free_event_id = 0; - lttng_chan->used_event_id = 0; lttng_chan->ops = &transport->ops; memcpy(<tng_chan->chan->backend.config, transport->client_config, @@ -507,8 +499,6 @@ int lttng_abi_map_channel(int session_objd, cds_list_add(<tng_chan->node, &session->chan_head); lttng_chan->header_type = 0; lttng_chan->handle = channel_handle; - lttng_chan->metadata_dumped = 0; - lttng_chan->id = session->free_chan_id++; lttng_chan->type = type; /* @@ -521,13 +511,30 @@ int lttng_abi_map_channel(int session_objd, objd_ref(session_objd); return chan_objd; + /* error path after channel was created */ objd_error: notransport: free(lttng_chan); 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; } @@ -547,8 +554,6 @@ active: * Enables tracing for a session (weak enable) * LTTNG_UST_DISABLE * Disables tracing for a session (strong disable) - * LTTNG_UST_METADATA - * Returns a LTTng metadata object descriptor * * The returned channel will be deleted when its file descriptor is closed. */ @@ -612,12 +617,9 @@ long lttng_tracepoint_list_cmd(int objd, unsigned int cmd, unsigned long arg, switch (cmd) { case LTTNG_UST_TRACEPOINT_LIST_GET: { - retry: iter = lttng_ust_tracepoint_list_get_iter_next(list); if (!iter) return -LTTNG_UST_ERR_NOENT; - if (!strcmp(iter->name, "lttng_ust:metadata")) - goto retry; memcpy(tp, iter, sizeof(*tp)); return 0; } @@ -657,7 +659,7 @@ alloc_error: { int err; - err = lttng_ust_objd_unref(list_objd); + err = lttng_ust_objd_unref(list_objd, 1); assert(!err); } objd_error: @@ -694,12 +696,9 @@ long lttng_tracepoint_field_list_cmd(int objd, unsigned int cmd, switch (cmd) { case LTTNG_UST_TRACEPOINT_FIELD_LIST_GET: { - retry: iter = lttng_ust_field_list_get_iter_next(list); if (!iter) return -LTTNG_UST_ERR_NOENT; - if (!strcmp(iter->event_name, "lttng_ust:metadata")) - goto retry; memcpy(tp, iter, sizeof(*tp)); return 0; } @@ -740,7 +739,7 @@ alloc_error: { int err; - err = lttng_ust_objd_unref(list_objd); + err = lttng_ust_objd_unref(list_objd, 1); assert(!err); } objd_error: @@ -819,47 +818,13 @@ event_error: { int err; - err = lttng_ust_objd_unref(event_objd); + err = lttng_ust_objd_unref(event_objd, 1); assert(!err); } objd_error: return ret; } -static -long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg, - union ust_args *uargs, void *owner) -{ - struct lttng_channel *channel = objd_private(objd); - struct lttng_session *session = channel->session; - - switch (cmd) { - case LTTNG_UST_STREAM: - { - struct lttng_ust_stream *stream; - int ret; - - stream = (struct lttng_ust_stream *) arg; - /* stream used as output */ - ret = lttng_abi_map_stream(objd, stream, uargs, owner); - if (ret == 0) { - session->metadata = channel; - lttng_metadata_create_events(objd); - } - return ret; - } - case LTTNG_UST_FLUSH_BUFFER: - { - if (!session->metadata) { - return -ENOENT; - } - return channel->ops->flush_buffer(channel->chan, channel->handle); - } - default: - return -EINVAL; - } -} - /** * lttng_channel_cmd - lttng control through object descriptors * @@ -898,10 +863,6 @@ long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg, return -EPERM; } - if (channel->type == LTTNG_UST_CHAN_METADATA) { - return lttng_metadata_cmd(objd, cmd, arg, uargs, owner); - } - switch (cmd) { case LTTNG_UST_STREAM: { @@ -945,7 +906,7 @@ int lttng_channel_release(int objd) struct lttng_channel *channel = objd_private(objd); if (channel) - return lttng_ust_objd_unref(channel->session->objd); + return lttng_ust_objd_unref(channel->session->objd, 0); return 0; } @@ -973,6 +934,8 @@ static const struct lttng_ust_objd_ops lttng_channel_ops = { * Disable recording for this enabler * LTTNG_UST_FILTER * Attach a filter to an enabler. + * LTTNG_UST_EXCLUSION + * Attach exclusions to an enabler. */ static long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg, @@ -998,6 +961,11 @@ long lttng_enabler_cmd(int objd, unsigned int cmd, unsigned long arg, return ret; return 0; } + case LTTNG_UST_EXCLUSION: + { + return lttng_enabler_attach_exclusion(enabler, + (struct lttng_ust_excluder_node *) arg); + } default: return -EINVAL; } @@ -1009,7 +977,7 @@ int lttng_enabler_release(int objd) struct lttng_enabler *enabler = objd_private(objd); if (enabler) - return lttng_ust_objd_unref(enabler->chan->objd); + return lttng_ust_objd_unref(enabler->chan->objd, 0); return 0; } @@ -1021,6 +989,8 @@ static const struct lttng_ust_objd_ops lttng_enabler_ops = { void lttng_ust_abi_exit(void) { lttng_ust_abi_close_in_progress = 1; + ust_lock_nocheck(); objd_table_destroy(); + ust_unlock(); lttng_ust_abi_close_in_progress = 0; }