X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=79085e57a55e7dd73e4fa71b01c4b2aa21bd5142;hb=a9ff648cc;hp=46717135cd4cdf9536f3ff74a4cd4252a8c7e849;hpb=b2f3252a48dfe0a2bac5b307157bcf2b25d044b3;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h index 46717135..79085e57 100644 --- a/liblttng-ust/lttng-ring-buffer-client.h +++ b/liblttng-ust/lttng-ring-buffer-client.h @@ -76,6 +76,7 @@ size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx) if (caa_likely(!ctx)) return 0; + offset += lib_ring_buffer_align(offset, ctx->largest_align); for (i = 0; i < ctx->nr_fields; i++) offset += ctx->fields[i].get_size(offset); return offset - orig_offset; @@ -90,6 +91,7 @@ void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx, if (caa_likely(!ctx)) return; + lib_ring_buffer_align_ctx(bufctx, ctx->largest_align); for (i = 0; i < ctx->nr_fields; i++) ctx->fields[i].record(&ctx->fields[i], bufctx, chan); } @@ -386,22 +388,24 @@ static void client_buffer_finalize(struct lttng_ust_lib_ring_buffer *buf, void * { } +static void client_content_size_field(const struct lttng_ust_lib_ring_buffer_config *config, + size_t *offset, size_t *length) +{ + *offset = offsetof(struct packet_header, ctx.content_size); + *length = sizeof(((struct packet_header *) NULL)->ctx.content_size); +} + +static void client_packet_size_field(const struct lttng_ust_lib_ring_buffer_config *config, + size_t *offset, size_t *length) +{ + *offset = offsetof(struct packet_header, ctx.packet_size); + *length = sizeof(((struct packet_header *) NULL)->ctx.packet_size); +} + static struct packet_header *client_packet_header(struct lttng_ust_lib_ring_buffer *buf, struct lttng_ust_shm_handle *handle) { - struct channel *chan = shmp(handle, buf->backend.chan); - struct lttng_channel *lttng_chan = channel_get_private(chan); - unsigned long sb_index; - struct lttng_ust_lib_ring_buffer_backend *bufb; - struct packet_header *header; - - bufb = &buf->backend; - sb_index = subbuffer_id_get_index(<tng_chan->chan->backend.config, - bufb->buf_rsb.id); - header = lib_ring_buffer_offset_address(bufb, - sb_index * lttng_chan->chan->backend.subbuf_size, - handle); - return header; + return lib_ring_buffer_read_offset_address(&buf->backend, 0, handle); } static int client_timestamp_begin(struct lttng_ust_lib_ring_buffer *buf, @@ -470,6 +474,18 @@ static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf, return 0; } +static int client_current_timestamp(struct lttng_ust_lib_ring_buffer *buf, + struct lttng_ust_shm_handle *handle, + uint64_t *ts) +{ + struct channel *chan; + + chan = shmp(handle, handle->chan); + *ts = client_ring_buffer_clock_read(chan); + + return 0; +} + static const struct lttng_ust_client_lib_ring_buffer_client_cb client_cb = { .parent = { @@ -480,6 +496,8 @@ struct lttng_ust_client_lib_ring_buffer_client_cb client_cb = { .buffer_end = client_buffer_end, .buffer_create = client_buffer_create, .buffer_finalize = client_buffer_finalize, + .content_size_field = client_content_size_field, + .packet_size_field = client_packet_size_field, }, .timestamp_begin = client_timestamp_begin, .timestamp_end = client_timestamp_end, @@ -487,6 +505,7 @@ struct lttng_ust_client_lib_ring_buffer_client_cb client_cb = { .content_size = client_content_size, .packet_size = client_packet_size, .stream_id = client_stream_id, + .current_timestamp = client_current_timestamp, }; static const struct lttng_ust_lib_ring_buffer_config client_config = { @@ -497,6 +516,8 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = { .cb.buffer_end = client_buffer_end, .cb.buffer_create = client_buffer_create, .cb.buffer_finalize = client_buffer_finalize, + .cb.content_size_field = client_content_size_field, + .cb.packet_size_field = client_packet_size_field, .tsc_bits = LTTNG_COMPACT_TSC_BITS, .alloc = RING_BUFFER_ALLOC_PER_CPU, @@ -521,7 +542,8 @@ struct lttng_channel *_channel_create(const char *name, unsigned int switch_timer_interval, unsigned int read_timer_interval, unsigned char *uuid, - uint32_t chan_id) + uint32_t chan_id, + const char *shm_path) { struct lttng_channel chan_priv_init; struct lttng_ust_shm_handle *handle; @@ -536,7 +558,8 @@ struct lttng_channel *_channel_create(const char *name, sizeof(struct lttng_channel), &chan_priv_init, buf_addr, subbuf_size, num_subbuf, - switch_timer_interval, read_timer_interval); + switch_timer_interval, read_timer_interval, + shm_path); if (!handle) return NULL; lttng_chan = priv; @@ -600,6 +623,13 @@ void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *sr lib_ring_buffer_write(&client_config, ctx, src, len); } +static +void lttng_event_strcpy(struct lttng_ust_lib_ring_buffer_ctx *ctx, const char *src, + size_t len) +{ + lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#'); +} + #if 0 static wait_queue_head_t *lttng_get_reader_wait_queue(struct channel *chan) @@ -650,6 +680,7 @@ static struct lttng_transport lttng_relay_transport = { .ops = { .channel_create = _channel_create, .channel_destroy = lttng_channel_destroy, + .u.has_strcpy = 1, .event_reserve = lttng_event_reserve, .event_commit = lttng_event_commit, .event_write = lttng_event_write, @@ -659,6 +690,7 @@ static struct lttng_transport lttng_relay_transport = { .is_finalized = lttng_is_finalized, .is_disabled = lttng_is_disabled, .flush_buffer = lttng_flush_buffer, + .event_strcpy = lttng_event_strcpy, }, .client_config = &client_config, };