X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=4e2b86a2d6c7ccbef220ed50e0fc1d4730dff0fb;hb=7489fcb466935b3eeb36e99afbbb87188278cb91;hp=31934b674637c71df83351a65c05fc07ea1bcfeb;hpb=daacdbfc04fe07ecff0a0d1878b4f48d38912c78;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h index 31934b67..4e2b86a2 100644 --- a/liblttng-ust/lttng-ring-buffer-client.h +++ b/liblttng-ust/lttng-ring-buffer-client.h @@ -10,6 +10,7 @@ #include #include +#include #include "ust-bitfield.h" #include "ust-compat.h" #include "clock.h" @@ -62,6 +63,8 @@ struct packet_header { struct lttng_client_ctx { 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) @@ -119,7 +122,7 @@ void ctx_get_struct_size(struct lttng_ust_ctx *ctx, size_t *ctx_len, static inline void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx, - struct lttng_channel *chan, + struct lttng_ust_channel_buffer *chan, struct lttng_ust_ctx *ctx, enum app_ctx_mode mode) { @@ -172,12 +175,11 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, struct lttng_ust_lib_ring_buffer_ctx *ctx, struct lttng_client_ctx *client_ctx) { - struct lttng_channel *lttng_chan = channel_get_private(chan); - struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv; + struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(chan); size_t orig_offset = offset; size_t padding; - switch (lttng_chan->header_type) { + switch (lttng_chan->priv->header_type) { case 1: /* compact */ padding = lib_ring_buffer_align(offset, lttng_alignof(uint32_t)); offset += padding; @@ -212,9 +214,9 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, padding = 0; WARN_ON_ONCE(1); } - offset += ctx_get_aligned_size(offset, lttng_ctx->chan_ctx, + 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; @@ -226,6 +228,7 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, static void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config, struct lttng_ust_lib_ring_buffer_ctx *ctx, + struct lttng_client_ctx *client_ctx, uint32_t event_id); /* @@ -240,15 +243,15 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config static __inline__ void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *config, struct lttng_ust_lib_ring_buffer_ctx *ctx, + struct lttng_client_ctx *client_ctx, uint32_t event_id) { - struct lttng_channel *lttng_chan = channel_get_private(ctx->chan); - struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv; + struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(ctx->chan); if (caa_unlikely(ctx->rflags)) goto slow_path; - switch (lttng_chan->header_type) { + switch (lttng_chan->priv->header_type) { case 1: /* compact */ { uint32_t id_time = 0; @@ -278,25 +281,25 @@ void lttng_write_event_header(const struct lttng_ust_lib_ring_buffer_config *con WARN_ON_ONCE(1); } - ctx_record(ctx, lttng_chan, lttng_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->chan_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; slow_path: - lttng_write_event_header_slow(config, ctx, event_id); + lttng_write_event_header_slow(config, ctx, client_ctx, event_id); } static void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config, struct lttng_ust_lib_ring_buffer_ctx *ctx, + struct lttng_client_ctx *client_ctx, uint32_t event_id) { - struct lttng_channel *lttng_chan = channel_get_private(ctx->chan); - struct lttng_ust_stack_ctx *lttng_ctx = ctx->priv; + struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(ctx->chan); - switch (lttng_chan->header_type) { + switch (lttng_chan->priv->header_type) { case 1: /* compact */ if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTTNG_RFLAG_EXTENDED))) { uint32_t id_time = 0; @@ -351,8 +354,8 @@ void lttng_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config default: WARN_ON_ONCE(1); } - ctx_record(ctx, lttng_chan, lttng_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->chan_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); } @@ -397,15 +400,15 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t lib_ring_buffer_offset_address(&buf->backend, subbuf_idx * chan->backend.subbuf_size, handle); - struct lttng_channel *lttng_chan = channel_get_private(chan); + struct lttng_ust_channel_buffer *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; + memcpy(header->uuid, lttng_chan->priv->uuid, sizeof(lttng_chan->priv->uuid)); + header->stream_id = lttng_chan->priv->id; header->stream_instance_id = buf->backend.cpu; header->ctx.timestamp_begin = tsc; header->ctx.timestamp_end = 0; @@ -548,9 +551,9 @@ static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf, { struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan); - struct lttng_channel *lttng_chan = channel_get_private(chan); + struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(chan); - *stream_id = lttng_chan->id; + *stream_id = lttng_chan->priv->id; return 0; } @@ -639,7 +642,7 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = { }; static -struct lttng_channel *_channel_create(const char *name, +struct lttng_ust_channel_buffer *_channel_create(const char *name, void *buf_addr, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, @@ -649,56 +652,67 @@ struct lttng_channel *_channel_create(const char *name, const int *stream_fds, int nr_stream_fds, int64_t blocking_timeout) { - struct lttng_channel chan_priv_init; + struct lttng_ust_abi_channel_config chan_priv_init; struct lttng_ust_shm_handle *handle; - struct lttng_channel *lttng_chan; - void *priv; + struct lttng_ust_channel_buffer *lttng_chan_buf; + + lttng_chan_buf = lttng_ust_alloc_channel_buffer(); + if (!lttng_chan_buf) + return NULL; + memcpy(lttng_chan_buf->priv->uuid, uuid, LTTNG_UST_UUID_LEN); + lttng_chan_buf->priv->id = chan_id; memset(&chan_priv_init, 0, sizeof(chan_priv_init)); memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN); chan_priv_init.id = chan_id; + handle = channel_create(&client_config, name, - &priv, __alignof__(struct lttng_channel), - sizeof(struct lttng_channel), + __alignof__(struct lttng_ust_abi_channel_config), + sizeof(struct lttng_ust_abi_channel_config), &chan_priv_init, - buf_addr, subbuf_size, num_subbuf, + lttng_chan_buf, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, read_timer_interval, stream_fds, nr_stream_fds, blocking_timeout); if (!handle) - return NULL; - lttng_chan = priv; - lttng_chan->handle = handle; - lttng_chan->chan = shmp(handle, handle->chan); - return lttng_chan; + goto error; + lttng_chan_buf->handle = handle; + lttng_chan_buf->chan = shmp(handle, handle->chan); + return lttng_chan_buf; + +error: + lttng_ust_free_channel_common(lttng_chan_buf->parent); + return NULL; } static -void lttng_channel_destroy(struct lttng_channel *chan) +void lttng_channel_destroy(struct lttng_ust_channel_buffer *lttng_chan_buf) { - channel_destroy(chan->chan, chan->handle, 1); + channel_destroy(lttng_chan_buf->chan, lttng_chan_buf->handle, 1); + lttng_ust_free_channel_common(lttng_chan_buf->parent); } static int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id) { - struct lttng_channel *lttng_chan = channel_get_private(ctx->chan); + 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; + int ret; + 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(lttng_ctx->chan_ctx, &client_ctx.packet_context_len, + 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); - if (cpu < 0) + if (lib_ring_buffer_nesting_inc(&client_config) < 0) return -EPERM; - ctx->cpu = cpu; - switch (lttng_chan->header_type) { + switch (lttng_chan->priv->header_type) { case 1: /* compact */ if (event_id > 30) ctx->rflags |= LTTNG_RFLAG_EXTENDED; @@ -719,10 +733,10 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, ret = -EPERM; goto put; } - lttng_write_event_header(&client_config, ctx, event_id); + lttng_write_event_header(&client_config, ctx, &client_ctx, event_id); return 0; put: - lib_ring_buffer_put_cpu(&client_config); + lib_ring_buffer_nesting_dec(&client_config); return ret; } @@ -730,7 +744,7 @@ static void lttng_event_commit(struct lttng_ust_lib_ring_buffer_ctx *ctx) { lib_ring_buffer_commit(&client_config, ctx); - lib_ring_buffer_put_cpu(&client_config); + lib_ring_buffer_nesting_dec(&client_config); } static @@ -747,6 +761,13 @@ void lttng_event_strcpy(struct lttng_ust_lib_ring_buffer_ctx *ctx, const char *s lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#'); } +static +void lttng_event_pstrcpy_pad(struct lttng_ust_lib_ring_buffer_ctx *ctx, + const char *src, size_t len) +{ + lib_ring_buffer_pstrcpy(&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) @@ -796,17 +817,21 @@ int lttng_flush_buffer(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), - .channel_create = _channel_create, - .channel_destroy = lttng_channel_destroy, + .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, + .packet_avail_size = NULL, /* Would be racy anyway */ + .is_finalized = lttng_is_finalized, + .is_disabled = lttng_is_disabled, + .flush_buffer = lttng_flush_buffer, + }), .event_reserve = lttng_event_reserve, .event_commit = lttng_event_commit, .event_write = lttng_event_write, - .packet_avail_size = NULL, /* Would be racy anyway */ - .is_finalized = lttng_is_finalized, - .is_disabled = lttng_is_disabled, - .flush_buffer = lttng_flush_buffer, .event_strcpy = lttng_event_strcpy, + .event_pstrcpy_pad = lttng_event_pstrcpy_pad, }, .client_config = &client_config, };