size_t packet_context_len;
size_t event_context_len;
struct lttng_ust_ctx *chan_ctx;
+ struct lttng_ust_ctx *event_ctx;
};
static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
struct lttng_client_ctx *client_ctx)
{
struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(chan);
- struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
size_t orig_offset = offset;
size_t padding;
}
offset += ctx_get_aligned_size(offset, client_ctx->chan_ctx,
client_ctx->packet_context_len);
- offset += ctx_get_aligned_size(offset, lttng_ctx->event_ctx,
+ offset += ctx_get_aligned_size(offset, client_ctx->event_ctx,
client_ctx->event_context_len);
*pre_header_padding = padding;
return offset - orig_offset;
uint32_t event_id)
{
struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(ctx->chan);
- struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
if (caa_unlikely(ctx->rflags))
goto slow_path;
}
ctx_record(ctx, lttng_chan, client_ctx->chan_ctx, APP_CTX_ENABLED);
- ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
+ ctx_record(ctx, lttng_chan, client_ctx->event_ctx, APP_CTX_ENABLED);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
return;
uint32_t event_id)
{
struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(ctx->chan);
- struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
switch (lttng_chan->priv->header_type) {
case 1: /* compact */
WARN_ON_ONCE(1);
}
ctx_record(ctx, lttng_chan, client_ctx->chan_ctx, APP_CTX_ENABLED);
- ctx_record(ctx, lttng_chan, lttng_ctx->event_ctx, APP_CTX_ENABLED);
+ ctx_record(ctx, lttng_chan, client_ctx->event_ctx, APP_CTX_ENABLED);
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
}
{
struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(ctx->chan);
struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv;
+ struct lttng_ust_event_recorder *event_recorder = lttng_ctx->event_recorder;
struct lttng_client_ctx client_ctx;
int ret, cpu;
client_ctx.chan_ctx = lttng_ust_rcu_dereference(lttng_chan->priv->ctx);
+ client_ctx.event_ctx = lttng_ust_rcu_dereference(event_recorder->priv->ctx);
/* Compute internal size of context structures. */
ctx_get_struct_size(client_ctx.chan_ctx, &client_ctx.packet_context_len,
APP_CTX_ENABLED);
- ctx_get_struct_size(lttng_ctx->event_ctx, &client_ctx.event_context_len,
+ ctx_get_struct_size(client_ctx.event_ctx, &client_ctx.event_context_len,
APP_CTX_ENABLED);
cpu = lib_ring_buffer_get_cpu(&client_config);
lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
}
+static
+void lttng_event_strcpy_pad(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ const char *src, size_t len)
+{
+ lib_ring_buffer_strcpy(&client_config, ctx, src, len, '\0');
+}
+
#if 0
static
wait_queue_head_t *lttng_get_reader_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan)
static struct lttng_transport lttng_relay_transport = {
.name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
.ops = {
- .struct_size = sizeof(struct lttng_ust_channel_ops),
- .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, {
+ .struct_size = sizeof(struct lttng_ust_channel_buffer_ops),
+ .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_buffer_ops_private, {
.pub = <tng_relay_transport.ops,
.channel_create = _channel_create,
.channel_destroy = lttng_channel_destroy,
.event_commit = lttng_event_commit,
.event_write = lttng_event_write,
.event_strcpy = lttng_event_strcpy,
+ .event_strcpy_pad = lttng_event_strcpy_pad,
},
.client_config = &client_config,
};