X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-client.h;h=270cb1e9f1a77c2f4073e728225ffc35aa5ed696;hb=1c5e467e5da8d549fa499c3ceb9739c5f704260d;hp=0d8051ece35bd5ec2e42e3641524b1c5c6a993fb;hpb=3d1fc7fd48d566eeb6e248de477995b789b094c7;p=lttng-ust.git diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h index 0d8051ec..270cb1e9 100644 --- a/libust/ltt-ring-buffer-client.h +++ b/libust/ltt-ring-buffer-client.h @@ -8,14 +8,12 @@ * Dual LGPL v2.1/GPL v2 license. */ -#include -#include -#include "lib/bitfield.h" -#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ -#include "wrapper/trace-clock.h" -#include "ltt-events.h" +#include +#include +#include "ust/bitfield.h" +#include "ust/clock.h" #include "ltt-tracer.h" -#include "wrapper/ringbuffer/frontend_types.h" +#include "../libringbuffer/frontend_types.h" /* * Keep the natural field alignment for _each field_ within this structure if @@ -107,7 +105,7 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, switch (ltt_chan->header_type) { case 1: /* compact */ - padding = lib_ring_buffer_align(offset, ltt_alignof(uint32_t)); + padding = lib_ring_buffer_align(offset, lttng_alignof(uint32_t)); offset += padding; if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTT_RFLAG_EXTENDED))) { offset += sizeof(uint32_t); /* id and timestamp */ @@ -115,28 +113,29 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, /* Minimum space taken by 5-bit id */ offset += sizeof(uint8_t); /* Align extended struct on largest member */ - offset += lib_ring_buffer_align(offset, ltt_alignof(uint64_t)); + offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t)); offset += sizeof(uint32_t); /* id */ - offset += lib_ring_buffer_align(offset, ltt_alignof(uint64_t)); + offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t)); offset += sizeof(uint64_t); /* timestamp */ } break; case 2: /* large */ - padding = lib_ring_buffer_align(offset, ltt_alignof(uint16_t)); + padding = lib_ring_buffer_align(offset, lttng_alignof(uint16_t)); offset += padding; offset += sizeof(uint16_t); if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTT_RFLAG_EXTENDED))) { - offset += lib_ring_buffer_align(offset, ltt_alignof(uint32_t)); + offset += lib_ring_buffer_align(offset, lttng_alignof(uint32_t)); offset += sizeof(uint32_t); /* timestamp */ } else { /* Align extended struct on largest member */ - offset += lib_ring_buffer_align(offset, ltt_alignof(uint64_t)); + offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t)); offset += sizeof(uint32_t); /* id */ - offset += lib_ring_buffer_align(offset, ltt_alignof(uint64_t)); + offset += lib_ring_buffer_align(offset, lttng_alignof(uint64_t)); offset += sizeof(uint64_t); /* timestamp */ } break; default: + padding = 0; WARN_ON_ONCE(1); } offset += ctx_get_size(offset, event->ctx); @@ -146,9 +145,9 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, return offset - orig_offset; } -#include "wrapper/ringbuffer/api.h" +#include "../libringbuffer/api.h" -extern +static void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, struct lib_ring_buffer_ctx *ctx, uint32_t event_id); @@ -189,7 +188,7 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config, uint16_t id = event_id; lib_ring_buffer_write(config, ctx, &id, sizeof(id)); - lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint32_t)); + lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint32_t)); lib_ring_buffer_write(config, ctx, ×tamp, sizeof(timestamp)); break; } @@ -197,8 +196,9 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config, WARN_ON_ONCE(1); } - ctx_record(ctx, ltt_chan, event->ctx); ctx_record(ctx, ltt_chan, ltt_chan->ctx); + ctx_record(ctx, ltt_chan, event->ctx); + lib_ring_buffer_align_ctx(ctx, ctx->largest_align); return; @@ -206,6 +206,7 @@ slow_path: ltt_write_event_header_slow(config, ctx, event_id); } +static void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, struct lib_ring_buffer_ctx *ctx, uint32_t event_id) @@ -228,9 +229,9 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, bt_bitfield_write(&id, uint8_t, 0, 5, 31); lib_ring_buffer_write(config, ctx, &id, sizeof(id)); /* Align extended struct on largest member */ - lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint64_t)); + lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint64_t)); lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id)); - lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint64_t)); + lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint64_t)); lib_ring_buffer_write(config, ctx, ×tamp, sizeof(timestamp)); } break; @@ -241,7 +242,7 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, uint16_t id = event_id; lib_ring_buffer_write(config, ctx, &id, sizeof(id)); - lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint32_t)); + lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint32_t)); lib_ring_buffer_write(config, ctx, ×tamp, sizeof(timestamp)); } else { uint16_t id = 65535; @@ -249,9 +250,9 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, lib_ring_buffer_write(config, ctx, &id, sizeof(id)); /* Align extended struct on largest member */ - lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint64_t)); + lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint64_t)); lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id)); - lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint64_t)); + lib_ring_buffer_align_ctx(ctx, lttng_alignof(uint64_t)); lib_ring_buffer_write(config, ctx, ×tamp, sizeof(timestamp)); } break; @@ -259,8 +260,9 @@ 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); + ctx_record(ctx, ltt_chan, event->ctx); + lib_ring_buffer_align_ctx(ctx, ctx->largest_align); } static const struct lib_ring_buffer_config client_config; @@ -293,18 +295,20 @@ static size_t client_packet_header_size(void) } static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc, - unsigned int subbuf_idx) + unsigned int subbuf_idx, + struct shm_handle *handle) { - struct channel *chan = buf->backend.chan; + struct channel *chan = shmp(handle, buf->backend.chan); struct packet_header *header = (struct packet_header *) lib_ring_buffer_offset_address(&buf->backend, - subbuf_idx * chan->backend.subbuf_size); + subbuf_idx * chan->backend.subbuf_size, + handle); struct ltt_channel *ltt_chan = channel_get_private(chan); struct ltt_session *session = ltt_chan->session; header->magic = CTF_MAGIC_NUMBER; - memcpy(header->uuid, session->uuid.b, sizeof(session->uuid)); + memcpy(header->uuid, session->uuid, sizeof(session->uuid)); header->stream_id = ltt_chan->id; header->ctx.timestamp_begin = tsc; header->ctx.timestamp_end = 0; @@ -319,31 +323,37 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc, * subbuffer. data_size is between 1 and subbuf_size. */ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc, - unsigned int subbuf_idx, unsigned long data_size) + unsigned int subbuf_idx, unsigned long data_size, + struct shm_handle *handle) { - struct channel *chan = buf->backend.chan; + struct channel *chan = shmp(handle, buf->backend.chan); struct packet_header *header = (struct packet_header *) lib_ring_buffer_offset_address(&buf->backend, - subbuf_idx * chan->backend.subbuf_size); + subbuf_idx * chan->backend.subbuf_size, + handle); unsigned long records_lost = 0; header->ctx.timestamp_end = tsc; header->ctx.content_size = data_size * CHAR_BIT; /* in bits */ header->ctx.packet_size = PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */ - records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf); + /* + * We do not care about the records lost count, because the metadata + * channel waits and retry. + */ + (void) lib_ring_buffer_get_records_lost_full(&client_config, buf); records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf); records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf); header->ctx.events_discarded = records_lost; } static int client_buffer_create(struct lib_ring_buffer *buf, void *priv, - int cpu, const char *name) + int cpu, const char *name, struct shm_handle *handle) { return 0; } -static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int cpu) +static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int cpu, struct shm_handle *handle) { } @@ -358,51 +368,64 @@ static const struct lib_ring_buffer_config client_config = { .tsc_bits = 32, .alloc = RING_BUFFER_ALLOC_PER_CPU, - .sync = RING_BUFFER_SYNC_PER_CPU, + .sync = RING_BUFFER_SYNC_GLOBAL, .mode = RING_BUFFER_MODE_TEMPLATE, .backend = RING_BUFFER_PAGE, - .output = RING_BUFFER_SPLICE, + .output = RING_BUFFER_MMAP, .oops = RING_BUFFER_OOPS_CONSISTENCY, - .ipi = RING_BUFFER_IPI_BARRIER, - .wakeup = RING_BUFFER_WAKEUP_BY_TIMER, + .ipi = RING_BUFFER_NO_IPI_BARRIER, + .wakeup = RING_BUFFER_WAKEUP_BY_WRITER, }; static -struct channel *_channel_create(const char *name, +struct ltt_channel *_channel_create(const char *name, struct ltt_channel *ltt_chan, void *buf_addr, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, - unsigned int read_timer_interval) + unsigned int read_timer_interval, + int *shm_fd, int *wait_fd, + uint64_t *memory_map_size) { - return channel_create(&client_config, name, ltt_chan, buf_addr, + ltt_chan->handle = channel_create(&client_config, name, ltt_chan, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, - read_timer_interval); + read_timer_interval, shm_fd, wait_fd, + memory_map_size); + if (!ltt_chan->handle) + return NULL; + ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan); + return ltt_chan; } static -void ltt_channel_destroy(struct channel *chan) +void ltt_channel_destroy(struct ltt_channel *ltt_chan) { - channel_destroy(chan); + channel_destroy(ltt_chan->chan, ltt_chan->handle, 0); } static -struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan) +struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan, + struct shm_handle *handle, + int *shm_fd, int *wait_fd, + uint64_t *memory_map_size) { struct lib_ring_buffer *buf; int cpu; for_each_channel_cpu(cpu, chan) { - buf = channel_get_ring_buffer(&client_config, chan, cpu); - if (!lib_ring_buffer_open_read(buf)) + buf = channel_get_ring_buffer(&client_config, chan, + cpu, handle, shm_fd, wait_fd, + memory_map_size); + if (!lib_ring_buffer_open_read(buf, handle, 0)) return buf; } return NULL; } static -void ltt_buffer_read_close(struct lib_ring_buffer *buf) +void ltt_buffer_read_close(struct lib_ring_buffer *buf, + struct shm_handle *handle) { - lib_ring_buffer_release_read(buf); + lib_ring_buffer_release_read(buf, handle, 0); } static @@ -454,6 +477,7 @@ void ltt_event_write(struct lib_ring_buffer_ctx *ctx, const void *src, lib_ring_buffer_write(&client_config, ctx, src, len); } +#if 0 static wait_queue_head_t *ltt_get_reader_wait_queue(struct channel *chan) { @@ -465,6 +489,7 @@ wait_queue_head_t *ltt_get_hp_wait_queue(struct channel *chan) { return &chan->hp_wait; } +#endif //0 static int ltt_is_finalized(struct channel *chan) @@ -479,8 +504,7 @@ int ltt_is_disabled(struct channel *chan) } static struct ltt_transport ltt_relay_transport = { - .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING, - .owner = THIS_MODULE, + .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap", .ops = { .channel_create = _channel_create, .channel_destroy = ltt_channel_destroy, @@ -490,36 +514,21 @@ static struct ltt_transport ltt_relay_transport = { .event_commit = ltt_event_commit, .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, + //.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, }, }; -static int __init ltt_ring_buffer_client_init(void) +void RING_BUFFER_MODE_TEMPLATE_INIT(void) { - /* - * This vmalloc sync all also takes care of the lib ring buffer - * 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"); + DBG("LTT : ltt ring buffer client init\n"); ltt_transport_register(<t_relay_transport); - return 0; } -module_init(ltt_ring_buffer_client_init); - -static void __exit ltt_ring_buffer_client_exit(void) +void RING_BUFFER_MODE_TEMPLATE_EXIT(void) { - printk(KERN_INFO "LTT : ltt ring buffer client exit\n"); + DBG("LTT : ltt ring buffer client exit\n"); ltt_transport_unregister(<t_relay_transport); } - -module_exit(ltt_ring_buffer_client_exit); - -MODULE_LICENSE("GPL and additional rights"); -MODULE_AUTHOR("Mathieu Desnoyers"); -MODULE_DESCRIPTION("LTTng ring buffer " RING_BUFFER_MODE_TEMPLATE_STRING - " client");