X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=3f1e2656437a13b20d4fcbfd8f2b429622b83c78;hb=5b6ff569c0bf82b72f263a259e7a73a453903648;hp=2cdecbe9f6bfdd8cf670304b20b29cc06cdaa4f1;hpb=fca361e81cbb39f076182e9d2c6dd2c4c8c25b5d;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h index 2cdecbe9..3f1e2656 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); } @@ -108,7 +110,7 @@ void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx, * contains. */ static __inline__ -unsigned char record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, +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) @@ -337,6 +339,9 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t handle); struct lttng_channel *lttng_chan = channel_get_private(chan); + 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; @@ -364,6 +369,9 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts handle); unsigned long records_lost = 0; + assert(header); + if (!header) + return; header->ctx.timestamp_end = tsc; header->ctx.content_size = (uint64_t) data_size * CHAR_BIT; /* in bits */ @@ -386,22 +394,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, @@ -411,6 +421,8 @@ static int client_timestamp_begin(struct lttng_ust_lib_ring_buffer *buf, struct packet_header *header; header = client_packet_header(buf, handle); + if (!header) + return -1; *timestamp_begin = header->ctx.timestamp_begin; return 0; } @@ -422,6 +434,8 @@ static int client_timestamp_end(struct lttng_ust_lib_ring_buffer *buf, struct packet_header *header; header = client_packet_header(buf, handle); + if (!header) + return -1; *timestamp_end = header->ctx.timestamp_end; return 0; } @@ -433,6 +447,8 @@ static int client_events_discarded(struct lttng_ust_lib_ring_buffer *buf, struct packet_header *header; header = client_packet_header(buf, handle); + if (!header) + return -1; *events_discarded = header->ctx.events_discarded; return 0; } @@ -444,6 +460,8 @@ static int client_content_size(struct lttng_ust_lib_ring_buffer *buf, struct packet_header *header; header = client_packet_header(buf, handle); + if (!header) + return -1; *content_size = header->ctx.content_size; return 0; } @@ -455,6 +473,8 @@ static int client_packet_size(struct lttng_ust_lib_ring_buffer *buf, struct packet_header *header; header = client_packet_header(buf, handle); + if (!header) + return -1; *packet_size = header->ctx.packet_size; return 0; } @@ -466,6 +486,8 @@ static int client_stream_id(struct lttng_ust_lib_ring_buffer *buf, struct packet_header *header; header = client_packet_header(buf, handle); + if (!header) + return -1; *stream_id = header->stream_id; return 0; } @@ -492,6 +514,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, @@ -510,6 +534,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, @@ -534,7 +560,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 int *stream_fds, int nr_stream_fds) { struct lttng_channel chan_priv_init; struct lttng_ust_shm_handle *handle; @@ -549,7 +576,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, + stream_fds, nr_stream_fds); if (!handle) return NULL; lttng_chan = priv; @@ -613,6 +641,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) @@ -663,6 +698,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, @@ -672,6 +708,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, };