X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-ring-buffer-event-notifier-client.h;h=9f4382583be17d95cf162bd99c23230b48bc33bb;hb=8a57ec025ffbe56153748fd69b60118862707182;hp=ea0ab66ed1fa868dd3d6701014bb9e081b18c8a3;hpb=250c663f720a611b8360fbc3d766628dd71e3fb5;p=lttng-modules.git diff --git a/src/lttng-ring-buffer-event-notifier-client.h b/src/lttng-ring-buffer-event-notifier-client.h index ea0ab66e..9f438258 100644 --- a/src/lttng-ring-buffer-event-notifier-client.h +++ b/src/lttng-ring-buffer-event-notifier-client.h @@ -7,11 +7,15 @@ * Copyright (C) 2010-2020 Mathieu Desnoyers */ +#include #include #include #include /* for wrapper_vmalloc_sync_mappings() */ +#include #include +#include #include +#include static struct lttng_transport lttng_relay_transport; @@ -20,6 +24,7 @@ struct event_notifier_packet_header { }; struct event_notifier_record_header { + uint32_t payload_len; /* in bytes */ uint8_t header_end[0]; /* End of header */ }; @@ -35,10 +40,20 @@ static inline size_t record_header_size(const struct lib_ring_buffer_config *config, struct channel *chan, size_t offset, size_t *pre_header_padding, - struct lib_ring_buffer_ctx *ctx, + struct lttng_kernel_ring_buffer_ctx *ctx, void *client_ctx) { - return 0; + size_t orig_offset = offset; + size_t padding; + + padding = lib_ring_buffer_align(offset, lttng_alignof(uint32_t)); + offset += padding; + + offset += sizeof(uint32_t); + + *pre_header_padding = padding; + + return offset - orig_offset; } #include @@ -52,10 +67,11 @@ static size_t client_record_header_size(const struct lib_ring_buffer_config *config, struct channel *chan, size_t offset, size_t *pre_header_padding, - struct lib_ring_buffer_ctx *ctx, + struct lttng_kernel_ring_buffer_ctx *ctx, void *client_ctx) { - return 0; + return record_header_size(config, chan, offset, + pre_header_padding, ctx, client_ctx); } /** @@ -169,10 +185,7 @@ static void client_record_get(const struct lib_ring_buffer_config *config, offsetof(struct event_notifier_record_header, header_end)); CHAN_WARN_ON(chan, ret != offsetof(struct event_notifier_record_header, header_end)); *header_len = offsetof(struct event_notifier_record_header, header_end); - /* - * Currently, only 64-bit event notifier ID. - */ - *payload_len = sizeof(uint64_t); + *payload_len = header.payload_len; *timestamp = 0; } @@ -274,47 +287,68 @@ void lttng_buffer_read_close(struct lib_ring_buffer *buf) } static -int lttng_event_reserve(struct lib_ring_buffer_ctx *ctx, uint32_t event_id) +void lttng_write_event_notifier_header(const struct lib_ring_buffer_config *config, + struct lttng_kernel_ring_buffer_ctx *ctx) +{ + uint32_t data_size; + + WARN_ON_ONCE(ctx->data_size > U32_MAX); + + data_size = (uint32_t) ctx->data_size; + + lib_ring_buffer_write(config, ctx, &data_size, sizeof(data_size)); + + lib_ring_buffer_align_ctx(ctx, ctx->largest_align); +} + +static +int lttng_event_reserve(struct lttng_kernel_ring_buffer_ctx *ctx) { + struct channel *chan = ctx->client_priv; int ret; + memset(&ctx->priv, 0, sizeof(ctx->priv)); + ctx->priv.chan = chan; + ret = lib_ring_buffer_reserve(&client_config, ctx, NULL); if (ret) return ret; lib_ring_buffer_backend_get_pages(&client_config, ctx, - &ctx->backend_pages); + &ctx->priv.backend_pages); + + lttng_write_event_notifier_header(&client_config, ctx); return 0; } static -void lttng_event_commit(struct lib_ring_buffer_ctx *ctx) +void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx) { lib_ring_buffer_commit(&client_config, ctx); } static -void lttng_event_write(struct lib_ring_buffer_ctx *ctx, const void *src, +void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src, size_t len) { lib_ring_buffer_write(&client_config, ctx, src, len); } static -void lttng_event_write_from_user(struct lib_ring_buffer_ctx *ctx, +void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx, const void __user *src, size_t len) { lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len); } static -void lttng_event_memset(struct lib_ring_buffer_ctx *ctx, +void lttng_event_memset(struct lttng_kernel_ring_buffer_ctx *ctx, int c, size_t len) { lib_ring_buffer_memset(&client_config, ctx, c, len); } static -void lttng_event_strcpy(struct lib_ring_buffer_ctx *ctx, const char *src, +void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src, size_t len) { lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#'); @@ -366,32 +400,35 @@ static struct lttng_transport lttng_relay_transport = { .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING, .owner = THIS_MODULE, .ops = { - .channel_create = _channel_create, - .channel_destroy = lttng_channel_destroy, - .buffer_read_open = lttng_buffer_read_open, - .buffer_has_read_closed_stream = - lttng_buffer_has_read_closed_stream, - .buffer_read_close = lttng_buffer_read_close, + .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_kernel_channel_buffer_ops_private, { + .pub = <tng_relay_transport.ops, + .channel_create = _channel_create, + .channel_destroy = lttng_channel_destroy, + .buffer_read_open = lttng_buffer_read_open, + .buffer_has_read_closed_stream = + lttng_buffer_has_read_closed_stream, + .buffer_read_close = lttng_buffer_read_close, + .packet_avail_size = lttng_packet_avail_size, + .get_writer_buf_wait_queue = lttng_get_writer_buf_wait_queue, + .get_hp_wait_queue = lttng_get_hp_wait_queue, + .is_finalized = lttng_is_finalized, + .is_disabled = lttng_is_disabled, + .timestamp_begin = client_timestamp_begin, + .timestamp_end = client_timestamp_end, + .events_discarded = client_events_discarded, + .content_size = client_content_size, + .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, + }), .event_reserve = lttng_event_reserve, .event_commit = lttng_event_commit, .event_write_from_user = lttng_event_write_from_user, .event_memset = lttng_event_memset, .event_write = lttng_event_write, .event_strcpy = lttng_event_strcpy, - .packet_avail_size = lttng_packet_avail_size, - .get_writer_buf_wait_queue = lttng_get_writer_buf_wait_queue, - .get_hp_wait_queue = lttng_get_hp_wait_queue, - .is_finalized = lttng_is_finalized, - .is_disabled = lttng_is_disabled, - .timestamp_begin = client_timestamp_begin, - .timestamp_end = client_timestamp_end, - .events_discarded = client_events_discarded, - .content_size = client_content_size, - .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, }, };