#include "lttng/core.h"
#include "ltt-tracer.h"
+static int lttng_ust_abi_close_in_progress;
+
static
int lttng_abi_tracepoint_list(void);
struct ltt_channel *channel = objd_private(channel_objd);
static struct lttng_ust_event metadata_params = {
.instrumentation = LTTNG_UST_TRACEPOINT,
- .name = "lttng_metadata",
+ .name = "lttng_ust:metadata",
};
struct ltt_event *event;
- int ret;
/*
* We tolerate no failure path after event creation. It will stay
*/
event = ltt_event_create(channel, &metadata_params, NULL);
if (!event) {
- ret = -EINVAL;
goto create_error;
}
return;
int ret = 0;
struct ltt_channel chan_priv_init;
- chan_objd = objd_alloc(NULL, <tng_channel_ops);
- if (chan_objd < 0) {
- ret = chan_objd;
- goto objd_error;
- }
switch (channel_type) {
case PER_CPU_CHANNEL:
if (chan_param->output == LTTNG_UST_MMAP) {
break;
default:
transport_name = "<unknown>";
- break;
+ return -EINVAL;
+ }
+ chan_objd = objd_alloc(NULL, ops);
+ if (chan_objd < 0) {
+ ret = chan_objd;
+ goto objd_error;
}
memset(&chan_priv_init, 0, sizeof(chan_priv_init));
/* Copy of session UUID for consumer (availability through shm) */
void ltt_tracepoint_list_get(struct ltt_tracepoint_list *list,
char *tp_list_entry)
{
+next:
if (!list->got_first) {
tracepoint_iter_start(&list->iter);
list->got_first = 1;
if (!list->iter.tracepoint) {
tp_list_entry[0] = '\0'; /* end of list */
} else {
+ if (!strcmp((*list->iter.tracepoint)->name,
+ "lttng_ust:metadata"))
+ goto next;
memcpy(tp_list_entry, (*list->iter.tracepoint)->name,
LTTNG_UST_SYM_NAME_LEN);
}
buf = priv->buf;
channel = priv->ltt_chan;
free(priv);
- channel->ops->buffer_read_close(buf, channel->handle);
+ /*
+ * If we are at ABI exit, we don't want to close the
+ * buffer opened for read: it is being shared between
+ * the parent and child (right after fork), and we don't
+ * want the child to close it for the parent. For a real
+ * exit, we don't care about marking it as closed, as
+ * the consumer daemon (if there is one) will do fine
+ * even if we don't mark it as "closed" for reading on
+ * our side.
+ * We only mark it as closed if it is being explicitely
+ * released by the session daemon with an explicit
+ * release command.
+ */
+ if (!lttng_ust_abi_close_in_progress)
+ channel->ops->buffer_read_close(buf, channel->handle);
return lttng_ust_objd_unref(channel->objd);
}
void lttng_ust_abi_exit(void)
{
+ lttng_ust_abi_close_in_progress = 1;
objd_table_destroy();
+ lttng_ust_abi_close_in_progress = 0;
}