X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=62d1ff82552fb8b04abc1d2ab8162bfe4c4bb9fb;hb=b4051ad8c170901d5297e1b3005b24e63cb0ab1e;hp=6ed067105d8e7fd0f8a280e3f09caa0375186836;hpb=630d6836f88124699c2a4554aeb33d9793f6764a;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h index 6ed06710..62d1ff82 100644 --- a/liblttng-ust/lttng-ring-buffer-client.h +++ b/liblttng-ust/lttng-ring-buffer-client.h @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include "lttng/bitfield.h" @@ -69,6 +70,10 @@ struct packet_header { } ctx; }; +struct lttng_client_ctx { + size_t packet_context_len; + size_t event_context_len; +}; static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan) { @@ -76,15 +81,29 @@ static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan) } static inline -size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx, - enum app_ctx_mode mode) +size_t ctx_get_aligned_size(size_t offset, struct lttng_ctx *ctx, + size_t ctx_len) { - int i; size_t orig_offset = offset; if (caa_likely(!ctx)) return 0; offset += lib_ring_buffer_align(offset, ctx->largest_align); + offset += ctx_len; + return offset - orig_offset; +} + +static inline +void ctx_get_struct_size(struct lttng_ctx *ctx, size_t *ctx_len, + enum app_ctx_mode mode) +{ + int i; + size_t offset = 0; + + if (caa_likely(!ctx)) { + *ctx_len = 0; + return; + } for (i = 0; i < ctx->nr_fields; i++) { if (mode == APP_CTX_ENABLED) { offset += ctx->fields[i].get_size(&ctx->fields[i], offset); @@ -106,7 +125,7 @@ size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx, } } } - return offset - orig_offset; + *ctx_len = offset; } static inline @@ -160,7 +179,8 @@ static __inline__ 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_ust_lib_ring_buffer_ctx *ctx, + struct lttng_client_ctx *client_ctx) { struct lttng_channel *lttng_chan = channel_get_private(chan); struct lttng_event *event = ctx->priv; @@ -205,12 +225,16 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, } 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); + offset += ctx_get_aligned_size(offset, lttng_ctx->chan_ctx, + client_ctx->packet_context_len); + offset += ctx_get_aligned_size(offset, lttng_ctx->event_ctx, + client_ctx->event_context_len); } 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); + offset += ctx_get_aligned_size(offset, lttng_chan->ctx, + client_ctx->packet_context_len); + offset += ctx_get_aligned_size(offset, event->ctx, + client_ctx->event_context_len); } *pre_header_padding = padding; return offset - orig_offset; @@ -379,10 +403,11 @@ static size_t client_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_ust_lib_ring_buffer_ctx *ctx, + void *client_ctx) { return record_header_size(config, chan, offset, - pre_header_padding, ctx); + pre_header_padding, ctx, client_ctx); } /** @@ -556,12 +581,11 @@ static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf, struct lttng_ust_shm_handle *handle, uint64_t *stream_id) { - struct packet_header *header; + struct channel *chan = shmp(handle, buf->backend.chan); + struct lttng_channel *lttng_chan = channel_get_private(chan); + + *stream_id = lttng_chan->id; - header = client_packet_header(buf, handle); - if (!header) - return -1; - *stream_id = header->stream_id; return 0; } @@ -584,6 +608,8 @@ static int client_sequence_number(struct lttng_ust_lib_ring_buffer *buf, struct packet_header *header; header = client_packet_header(buf, handle); + if (!header) + return -1; *seq = header->ctx.packet_seq_num; return 0; } @@ -592,10 +618,8 @@ 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; + *id = buf->backend.cpu; - header = client_packet_header(buf, handle); - *id = header->stream_instance_id; return 0; } @@ -658,7 +682,8 @@ struct lttng_channel *_channel_create(const char *name, unsigned int read_timer_interval, unsigned char *uuid, uint32_t chan_id, - const int *stream_fds, int nr_stream_fds) + const int *stream_fds, int nr_stream_fds, + int64_t blocking_timeout) { struct lttng_channel chan_priv_init; struct lttng_ust_shm_handle *handle; @@ -674,7 +699,7 @@ struct lttng_channel *_channel_create(const char *name, &chan_priv_init, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, read_timer_interval, - stream_fds, nr_stream_fds); + stream_fds, nr_stream_fds, blocking_timeout); if (!handle) return NULL; lttng_chan = priv; @@ -694,8 +719,27 @@ 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_event *event = ctx->priv; + struct lttng_stack_ctx *lttng_ctx = ctx->priv2; + struct lttng_client_ctx client_ctx; int ret, cpu; + /* Compute internal size of context structures. */ + + if (lttng_ctx) { + /* 2.8+ probe ABI. */ + ctx_get_struct_size(lttng_ctx->chan_ctx, &client_ctx.packet_context_len, + APP_CTX_ENABLED); + ctx_get_struct_size(lttng_ctx->event_ctx, &client_ctx.event_context_len, + APP_CTX_ENABLED); + } else { + /* Pre 2.8 probe ABI. */ + ctx_get_struct_size(lttng_chan->ctx, &client_ctx.packet_context_len, + APP_CTX_DISABLED); + ctx_get_struct_size(event->ctx, &client_ctx.event_context_len, + APP_CTX_DISABLED); + } + cpu = lib_ring_buffer_get_cpu(&client_config); if (cpu < 0) return -EPERM; @@ -714,7 +758,7 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, WARN_ON_ONCE(1); } - ret = lib_ring_buffer_reserve(&client_config, ctx); + ret = lib_ring_buffer_reserve(&client_config, ctx, &client_ctx); if (caa_unlikely(ret)) goto put; if (caa_likely(ctx->ctx_len