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;
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';
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);
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);
{
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;
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);
}
}
goto objd_error;
}
session->objd = session_objd;
+ session->owner = owner;
return session_objd;
objd_error:
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;
}
.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,
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) {
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;
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) {
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 = "<unknown>";
chan_name = "<unknown>";
/* 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,
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;
/*
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;
}
* 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.
*/
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;
}
{
int err;
- err = lttng_ust_objd_unref(list_objd);
+ err = lttng_ust_objd_unref(list_objd, 1);
assert(!err);
}
objd_error:
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;
}
{
int err;
- err = lttng_ust_objd_unref(list_objd);
+ err = lttng_ust_objd_unref(list_objd, 1);
assert(!err);
}
objd_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
*
return -EPERM;
}
- if (channel->type == LTTNG_UST_CHAN_METADATA) {
- return lttng_metadata_cmd(objd, cmd, arg, uargs, owner);
- }
-
switch (cmd) {
case LTTNG_UST_STREAM:
{
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;
}
* 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,
return ret;
return 0;
}
+ case LTTNG_UST_EXCLUSION:
+ {
+ return lttng_enabler_attach_exclusion(enabler,
+ (struct lttng_ust_excluder_node *) arg);
+ }
default:
return -EINVAL;
}
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;
}
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;
}
projects / lttng-ust.git / blobdiff