X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt-ring-buffer-client.h;h=39587dd0b15f2054454a57bda420cc78ec680a62;hb=2db1399a47bc5a86dade078994cd1060d6d56f64;hp=1c3d014d43cd8248a2aca5d65faff48f8935193a;hpb=679b17d0d97e2e87dd390eb3d0e10c0b1f7f02b5;p=lttng-modules.git diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h index 1c3d014d..39587dd0 100644 --- a/ltt-ring-buffer-client.h +++ b/ltt-ring-buffer-client.h @@ -55,6 +55,32 @@ static inline notrace u64 lib_ring_buffer_clock_read(struct channel *chan) return trace_clock_read64(); } +static inline +size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx) +{ + int i; + size_t orig_offset = offset; + + if (likely(!ctx)) + return 0; + for (i = 0; i < ctx->nr_fields; i++) + offset += ctx->fields[i].get_size(offset); + return offset - orig_offset; +} + +static inline +void ctx_record(struct lib_ring_buffer_ctx *bufctx, + struct ltt_channel *chan, + struct lttng_ctx *ctx) +{ + int i; + + if (likely(!ctx)) + return; + for (i = 0; i < ctx->nr_fields; i++) + ctx->fields[i].record(&ctx->fields[i], bufctx, chan); +} + /* * record_header_size - Calculate the header size and padding necessary. * @config: ring buffer instance configuration @@ -75,6 +101,7 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, struct lib_ring_buffer_ctx *ctx) { struct ltt_channel *ltt_chan = channel_get_private(chan); + struct ltt_event *event = ctx->priv; size_t orig_offset = offset; size_t padding; @@ -107,12 +134,13 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, offset += sizeof(uint32_t); /* id */ offset += lib_ring_buffer_align(offset, ltt_alignof(uint64_t)); offset += sizeof(uint64_t); /* timestamp */ - } break; default: WARN_ON_ONCE(1); } + offset += ctx_get_size(offset, event->ctx); + offset += ctx_get_size(offset, ltt_chan->ctx); *pre_header_padding = padding; return offset - orig_offset; @@ -140,6 +168,7 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config, uint32_t event_id) { struct ltt_channel *ltt_chan = channel_get_private(ctx->chan); + struct ltt_event *event = ctx->priv; if (unlikely(ctx->rflags)) goto slow_path; @@ -157,8 +186,9 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config, case 2: /* large */ { uint32_t timestamp = (uint32_t) ctx->tsc; + uint16_t id = event_id; - lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id)); + lib_ring_buffer_write(config, ctx, &id, sizeof(id)); lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint32_t)); lib_ring_buffer_write(config, ctx, ×tamp, sizeof(timestamp)); break; @@ -166,6 +196,10 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config, default: WARN_ON_ONCE(1); } + + ctx_record(ctx, ltt_chan, event->ctx); + ctx_record(ctx, ltt_chan, ltt_chan->ctx); + return; slow_path: @@ -177,6 +211,7 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, uint32_t event_id) { struct ltt_channel *ltt_chan = channel_get_private(ctx->chan); + struct ltt_event *event = ctx->priv; switch (ltt_chan->header_type) { case 1: /* compact */ @@ -203,8 +238,9 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, { if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTT_RFLAG_EXTENDED))) { uint32_t timestamp = (uint32_t) ctx->tsc; + uint16_t id = event_id; - lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id)); + lib_ring_buffer_write(config, ctx, &id, sizeof(id)); lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint32_t)); lib_ring_buffer_write(config, ctx, ×tamp, sizeof(timestamp)); } else { @@ -223,6 +259,8 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, default: WARN_ON_ONCE(1); } + ctx_record(ctx, ltt_chan, event->ctx); + ctx_record(ctx, ltt_chan, ltt_chan->ctx); } static const struct lib_ring_buffer_config client_config; @@ -323,7 +361,7 @@ static const struct lib_ring_buffer_config client_config = { .sync = RING_BUFFER_SYNC_PER_CPU, .mode = RING_BUFFER_MODE_TEMPLATE, .backend = RING_BUFFER_PAGE, - .output = RING_BUFFER_SPLICE, + .output = RING_BUFFER_OUTPUT_TEMPLATE, .oops = RING_BUFFER_OOPS_CONSISTENCY, .ipi = RING_BUFFER_IPI_BARRIER, .wakeup = RING_BUFFER_WAKEUP_BY_TIMER, @@ -365,7 +403,6 @@ static void ltt_buffer_read_close(struct lib_ring_buffer *buf) { lib_ring_buffer_release_read(buf); - } static @@ -418,9 +455,27 @@ void ltt_event_write(struct lib_ring_buffer_ctx *ctx, const void *src, } static -wait_queue_head_t *ltt_get_reader_wait_queue(struct ltt_channel *chan) +wait_queue_head_t *ltt_get_reader_wait_queue(struct channel *chan) +{ + return &chan->read_wait; +} + +static +wait_queue_head_t *ltt_get_hp_wait_queue(struct channel *chan) +{ + return &chan->hp_wait; +} + +static +int ltt_is_finalized(struct channel *chan) +{ + return lib_ring_buffer_channel_is_finalized(chan); +} + +static +int ltt_is_disabled(struct channel *chan) { - return &chan->chan->read_wait; + return lib_ring_buffer_channel_is_disabled(chan); } static struct ltt_transport ltt_relay_transport = { @@ -436,6 +491,9 @@ static struct ltt_transport ltt_relay_transport = { .event_write = ltt_event_write, .packet_avail_size = NULL, /* Would be racy anyway */ .get_reader_wait_queue = ltt_get_reader_wait_queue, + .get_hp_wait_queue = ltt_get_hp_wait_queue, + .is_finalized = ltt_is_finalized, + .is_disabled = ltt_is_disabled, }, }; @@ -446,7 +504,6 @@ static int __init ltt_ring_buffer_client_init(void) * vmalloc'd module pages when it is built as a module into LTTng. */ wrapper_vmalloc_sync_all(); - printk(KERN_INFO "LTT : ltt ring buffer client init\n"); ltt_transport_register(<t_relay_transport); return 0; } @@ -455,7 +512,6 @@ module_init(ltt_ring_buffer_client_init); static void __exit ltt_ring_buffer_client_exit(void) { - printk(KERN_INFO "LTT : ltt ring buffer client exit\n"); ltt_transport_unregister(<t_relay_transport); }