#define LTTNG_COMPACT_EVENT_BITS 5
#define LTTNG_COMPACT_TSC_BITS 27
+enum app_ctx_mode {
+ APP_CTX_DISABLED,
+ APP_CTX_ENABLED,
+};
+
/*
* Keep the natural field alignment for _each field_ within this structure if
* you ever add/remove a field from this header. Packed attribute is not used
*/
uint8_t uuid[LTTNG_UST_UUID_LEN];
uint32_t stream_id;
+ uint64_t stream_instance_id;
struct {
/* Stream packet context */
uint64_t timestamp_end; /* Cycle count at subbuffer end */
uint64_t content_size; /* Size of data in subbuffer */
uint64_t packet_size; /* Subbuffer size (include padding) */
+ uint64_t packet_seq_num; /* Packet sequence number */
unsigned long events_discarded; /*
* Events lost in this subbuffer since
* the beginning of the trace.
}
static inline
-size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx)
+size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx,
+ enum app_ctx_mode mode)
{
int i;
size_t orig_offset = offset;
if (caa_likely(!ctx))
return 0;
- for (i = 0; i < ctx->nr_fields; i++)
- offset += ctx->fields[i].get_size(offset);
+ offset += lib_ring_buffer_align(offset, ctx->largest_align);
+ for (i = 0; i < ctx->nr_fields; i++) {
+ if (mode == APP_CTX_ENABLED) {
+ offset += ctx->fields[i].get_size(&ctx->fields[i], offset);
+ } else {
+ if (lttng_context_is_app(ctx->fields[i].event_field.name)) {
+ /*
+ * Before UST 2.8, we cannot use the
+ * application context, because we
+ * cannot trust that the handler used
+ * for get_size is the same used for
+ * ctx_record, which would result in
+ * corrupted traces when tracing
+ * concurrently with application context
+ * register/unregister.
+ */
+ offset += lttng_ust_dummy_get_size(&ctx->fields[i], offset);
+ } else {
+ offset += ctx->fields[i].get_size(&ctx->fields[i], offset);
+ }
+ }
+ }
return offset - orig_offset;
}
static inline
void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
struct lttng_channel *chan,
- struct lttng_ctx *ctx)
+ struct lttng_ctx *ctx,
+ enum app_ctx_mode mode)
{
int i;
if (caa_likely(!ctx))
return;
- for (i = 0; i < ctx->nr_fields; i++)
- ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+ lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
+ for (i = 0; i < ctx->nr_fields; i++) {
+ if (mode == APP_CTX_ENABLED) {
+ ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+ } else {
+ if (lttng_context_is_app(ctx->fields[i].event_field.name)) {
+ /*
+ * Before UST 2.8, we cannot use the
+ * application context, because we
+ * cannot trust that the handler used
+ * for get_size is the same used for
+ * ctx_record, which would result in
+ * corrupted traces when tracing
+ * concurrently with application context
+ * register/unregister.
+ */
+ lttng_ust_dummy_record(&ctx->fields[i], bufctx, chan);
+ } else {
+ ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
+ }
+ }
+ }
}
/*
* contains.
*/
static __inline__
-unsigned char record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
+size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
struct channel *chan, size_t offset,
size_t *pre_header_padding,
struct lttng_ust_lib_ring_buffer_ctx *ctx)
{
struct lttng_channel *lttng_chan = channel_get_private(chan);
struct lttng_event *event = ctx->priv;
+ struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
size_t orig_offset = offset;
size_t padding;
padding = 0;
WARN_ON_ONCE(1);
}
- offset += ctx_get_size(offset, event->ctx);
- offset += ctx_get_size(offset, lttng_chan->ctx);
-
+ if (lttng_ctx) {
+ /* 2.8+ probe ABI. */
+ offset += ctx_get_size(offset, lttng_ctx->chan_ctx, APP_CTX_ENABLED);
+ offset += ctx_get_size(offset, lttng_ctx->event_ctx, APP_CTX_ENABLED);
+ } else {
+ /* Pre 2.8 probe ABI. */
+ offset += ctx_get_size(offset, lttng_chan->ctx, APP_CTX_DISABLED);
+ offset += ctx_get_size(offset, event->ctx, APP_CTX_DISABLED);
+ }
*pre_header_padding = padding;
return offset - orig_offset;
}
{
struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
struct lttng_event *event = ctx->priv;
+ struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
if (caa_unlikely(ctx->rflags))
goto slow_path;
WARN_ON_ONCE(1);
}
- ctx_record(ctx, lttng_chan, lttng_chan->ctx);
- ctx_record(ctx, lttng_chan, event->ctx);
+ if (lttng_ctx) {
+ /* 2.8+ probe ABI. */
+ ctx_record(ctx, lttng_chan, lttng_ctx->chan_ctx, APP_CTX_ENABLED);
+ ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
+ } else {
+ /* Pre 2.8 probe ABI. */
+ ctx_record(ctx, lttng_chan, lttng_chan->ctx, APP_CTX_DISABLED);
+ ctx_record(ctx, lttng_chan, event->ctx, APP_CTX_DISABLED);
+ }
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
return;
{
struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
struct lttng_event *event = ctx->priv;
+ struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
switch (lttng_chan->header_type) {
case 1: /* compact */
default:
WARN_ON_ONCE(1);
}
- ctx_record(ctx, lttng_chan, lttng_chan->ctx);
- ctx_record(ctx, lttng_chan, event->ctx);
+ if (lttng_ctx) {
+ /* 2.8+ probe ABI. */
+ ctx_record(ctx, lttng_chan, lttng_ctx->chan_ctx, APP_CTX_ENABLED);
+ ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
+ } else {
+ /* Pre 2.8 probe ABI. */
+ ctx_record(ctx, lttng_chan, lttng_chan->ctx, APP_CTX_DISABLED);
+ ctx_record(ctx, lttng_chan, event->ctx, APP_CTX_DISABLED);
+ }
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
}
subbuf_idx * chan->backend.subbuf_size,
handle);
struct lttng_channel *lttng_chan = channel_get_private(chan);
+ uint64_t cnt = shmp_index(handle, buf->backend.buf_cnt, subbuf_idx)->seq_cnt;
+ assert(header);
+ if (!header)
+ return;
header->magic = CTF_MAGIC_NUMBER;
memcpy(header->uuid, lttng_chan->uuid, sizeof(lttng_chan->uuid));
header->stream_id = lttng_chan->id;
+ header->stream_instance_id = buf->backend.cpu;
header->ctx.timestamp_begin = tsc;
header->ctx.timestamp_end = 0;
header->ctx.content_size = ~0ULL; /* for debugging */
header->ctx.packet_size = ~0ULL;
+ header->ctx.packet_seq_num = chan->backend.num_subbuf * cnt + subbuf_idx;
header->ctx.events_discarded = 0;
header->ctx.cpu_id = buf->backend.cpu;
}
handle);
unsigned long records_lost = 0;
+ assert(header);
+ if (!header)
+ return;
header->ctx.timestamp_end = tsc;
header->ctx.content_size =
(uint64_t) data_size * CHAR_BIT; /* in bits */
{
}
+static void client_content_size_field(const struct lttng_ust_lib_ring_buffer_config *config,
+ size_t *offset, size_t *length)
+{
+ *offset = offsetof(struct packet_header, ctx.content_size);
+ *length = sizeof(((struct packet_header *) NULL)->ctx.content_size);
+}
+
+static void client_packet_size_field(const struct lttng_ust_lib_ring_buffer_config *config,
+ size_t *offset, size_t *length)
+{
+ *offset = offsetof(struct packet_header, ctx.packet_size);
+ *length = sizeof(((struct packet_header *) NULL)->ctx.packet_size);
+}
+
static struct packet_header *client_packet_header(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle)
{
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*timestamp_begin = header->ctx.timestamp_begin;
return 0;
}
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*timestamp_end = header->ctx.timestamp_end;
return 0;
}
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*events_discarded = header->ctx.events_discarded;
return 0;
}
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*content_size = header->ctx.content_size;
return 0;
}
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*packet_size = header->ctx.packet_size;
return 0;
}
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*stream_id = header->stream_id;
return 0;
}
return 0;
}
+static int client_sequence_number(struct lttng_ust_lib_ring_buffer *buf,
+ struct lttng_ust_shm_handle *handle,
+ uint64_t *seq)
+{
+ struct packet_header *header;
+
+ header = client_packet_header(buf, handle);
+ *seq = header->ctx.packet_seq_num;
+ return 0;
+}
+
+static int client_instance_id(struct lttng_ust_lib_ring_buffer *buf,
+ struct lttng_ust_shm_handle *handle,
+ uint64_t *id)
+{
+ struct packet_header *header;
+
+ header = client_packet_header(buf, handle);
+ *id = header->stream_instance_id;
+ return 0;
+}
+
static const
struct lttng_ust_client_lib_ring_buffer_client_cb client_cb = {
.parent = {
.buffer_end = client_buffer_end,
.buffer_create = client_buffer_create,
.buffer_finalize = client_buffer_finalize,
+ .content_size_field = client_content_size_field,
+ .packet_size_field = client_packet_size_field,
},
.timestamp_begin = client_timestamp_begin,
.timestamp_end = client_timestamp_end,
.packet_size = client_packet_size,
.stream_id = client_stream_id,
.current_timestamp = client_current_timestamp,
+ .sequence_number = client_sequence_number,
+ .instance_id = client_instance_id,
};
static const struct lttng_ust_lib_ring_buffer_config client_config = {
.cb.buffer_end = client_buffer_end,
.cb.buffer_create = client_buffer_create,
.cb.buffer_finalize = client_buffer_finalize,
+ .cb.content_size_field = client_content_size_field,
+ .cb.packet_size_field = client_packet_size_field,
.tsc_bits = LTTNG_COMPACT_TSC_BITS,
.alloc = RING_BUFFER_ALLOC_PER_CPU,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
unsigned char *uuid,
- uint32_t chan_id)
+ uint32_t chan_id,
+ const int *stream_fds, int nr_stream_fds)
{
struct lttng_channel chan_priv_init;
struct lttng_ust_shm_handle *handle;
sizeof(struct lttng_channel),
&chan_priv_init,
buf_addr, subbuf_size, num_subbuf,
- switch_timer_interval, read_timer_interval);
+ switch_timer_interval, read_timer_interval,
+ stream_fds, nr_stream_fds);
if (!handle)
return NULL;
lttng_chan = priv;
}
ret = lib_ring_buffer_reserve(&client_config, ctx);
- if (ret)
+ if (caa_unlikely(ret))
goto put;
+ if (caa_likely(ctx->ctx_len
+ >= sizeof(struct lttng_ust_lib_ring_buffer_ctx))) {
+ if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
+ &ctx->backend_pages)) {
+ ret = -EPERM;
+ goto put;
+ }
+ }
lttng_write_event_header(&client_config, ctx, event_id);
return 0;
put:
lib_ring_buffer_write(&client_config, ctx, src, len);
}
+static
+void lttng_event_strcpy(struct lttng_ust_lib_ring_buffer_ctx *ctx, const char *src,
+ size_t len)
+{
+ lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
+}
+
#if 0
static
wait_queue_head_t *lttng_get_reader_wait_queue(struct channel *chan)
.ops = {
.channel_create = _channel_create,
.channel_destroy = lttng_channel_destroy,
+ .u.has_strcpy = 1,
.event_reserve = lttng_event_reserve,
.event_commit = lttng_event_commit,
.event_write = lttng_event_write,
.is_finalized = lttng_is_finalized,
.is_disabled = lttng_is_disabled,
.flush_buffer = lttng_flush_buffer,
+ .event_strcpy = lttng_event_strcpy,
},
.client_config = &client_config,
};