X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-client.h;h=6361b9edeb912e0a8f543483e6c67e30d527328c;hb=4cfec15c93af7e0cfe3ce769ee90486bb8ab7c37;hp=f15711c1320e00d7c7b3dc9f88100dd195f15510;hpb=18c1cd87c54290691f0e6913f84c16fa5267b86d;p=lttng-ust.git diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h index f15711c1..6361b9ed 100644 --- a/libust/ltt-ring-buffer-client.h +++ b/libust/ltt-ring-buffer-client.h @@ -67,7 +67,7 @@ size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx) } static inline -void ctx_record(struct lib_ring_buffer_ctx *bufctx, +void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx, struct ltt_channel *chan, struct lttng_ctx *ctx) { @@ -93,10 +93,10 @@ void ctx_record(struct lib_ring_buffer_ctx *bufctx, * contains. */ static __inline__ -unsigned char record_header_size(const struct lib_ring_buffer_config *config, +unsigned char record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, struct channel *chan, size_t offset, size_t *pre_header_padding, - struct lib_ring_buffer_ctx *ctx) + struct lttng_ust_lib_ring_buffer_ctx *ctx) { struct ltt_channel *ltt_chan = channel_get_private(chan); struct ltt_event *event = ctx->priv; @@ -148,8 +148,8 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, #include "../libringbuffer/api.h" static -void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, - struct lib_ring_buffer_ctx *ctx, +void ltt_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config, + struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id); /* @@ -162,8 +162,8 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, * @event_id: event ID */ static __inline__ -void ltt_write_event_header(const struct lib_ring_buffer_config *config, - struct lib_ring_buffer_ctx *ctx, +void ltt_write_event_header(const struct lttng_ust_lib_ring_buffer_config *config, + struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id) { struct ltt_channel *ltt_chan = channel_get_private(ctx->chan); @@ -198,6 +198,7 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config, 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,8 +207,8 @@ slow_path: } static -void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, - struct lib_ring_buffer_ctx *ctx, +void ltt_write_event_header_slow(const struct lttng_ust_lib_ring_buffer_config *config, + struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id) { struct ltt_channel *ltt_chan = channel_get_private(ctx->chan); @@ -261,9 +262,10 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config, } 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; +static const struct lttng_ust_lib_ring_buffer_config client_config; static u64 client_ring_buffer_clock_read(struct channel *chan) { @@ -271,10 +273,10 @@ static u64 client_ring_buffer_clock_read(struct channel *chan) } static -size_t client_record_header_size(const struct lib_ring_buffer_config *config, +size_t client_record_header_size(const struct lttng_ust_lib_ring_buffer_config *config, struct channel *chan, size_t offset, size_t *pre_header_padding, - struct lib_ring_buffer_ctx *ctx) + struct lttng_ust_lib_ring_buffer_ctx *ctx) { return record_header_size(config, chan, offset, pre_header_padding, ctx); @@ -292,9 +294,9 @@ static size_t client_packet_header_size(void) return offsetof(struct packet_header, ctx.header_end); } -static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc, +static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, unsigned int subbuf_idx, - struct shm_handle *handle) + struct lttng_ust_shm_handle *handle) { struct channel *chan = shmp(handle, buf->backend.chan); struct packet_header *header = @@ -320,9 +322,9 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc, * offset is assumed to never be 0 here : never deliver a completely empty * subbuffer. data_size is between 1 and subbuf_size. */ -static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc, +static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, unsigned int subbuf_idx, unsigned long data_size, - struct shm_handle *handle) + struct lttng_ust_shm_handle *handle) { struct channel *chan = shmp(handle, buf->backend.chan); struct packet_header *header = @@ -335,23 +337,27 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc, 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, struct shm_handle *handle) +static int client_buffer_create(struct lttng_ust_lib_ring_buffer *buf, void *priv, + int cpu, const char *name, struct lttng_ust_shm_handle *handle) { return 0; } -static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int cpu, struct shm_handle *handle) +static void client_buffer_finalize(struct lttng_ust_lib_ring_buffer *buf, void *priv, int cpu, struct lttng_ust_shm_handle *handle) { } -static const struct lib_ring_buffer_config client_config = { +static const struct lttng_ust_lib_ring_buffer_config client_config = { .cb.ring_buffer_clock_read = client_ring_buffer_clock_read, .cb.record_header_size = client_record_header_size, .cb.subbuffer_header_size = client_packet_header_size, @@ -376,45 +382,54 @@ 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) { ltt_chan->handle = channel_create(&client_config, name, ltt_chan, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, - read_timer_interval); - ltt_chan->chan = shmp(handle, handle->chan); + 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 ltt_channel *ltt_chan) { - channel_destroy(ltt_chan->chan, ltt_chan->handle); + channel_destroy(ltt_chan->chan, ltt_chan->handle, 0); } static -struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan, - struct shm_handle *handle) +struct lttng_ust_lib_ring_buffer *ltt_buffer_read_open(struct channel *chan, + struct lttng_ust_shm_handle *handle, + int *shm_fd, int *wait_fd, + uint64_t *memory_map_size) { - struct lib_ring_buffer *buf; + struct lttng_ust_lib_ring_buffer *buf; int cpu; for_each_channel_cpu(cpu, chan) { - buf = channel_get_ring_buffer(&client_config, chan, cpu, handle); - if (!lib_ring_buffer_open_read(buf, handle)) + 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, - struct shm_handle *handle) +void ltt_buffer_read_close(struct lttng_ust_lib_ring_buffer *buf, + struct lttng_ust_shm_handle *handle) { - lib_ring_buffer_release_read(buf, handle); + lib_ring_buffer_release_read(buf, handle, 0); } static -int ltt_event_reserve(struct lib_ring_buffer_ctx *ctx, +int ltt_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id) { struct ltt_channel *ltt_chan = channel_get_private(ctx->chan); @@ -449,14 +464,14 @@ put: } static -void ltt_event_commit(struct lib_ring_buffer_ctx *ctx) +void ltt_event_commit(struct lttng_ust_lib_ring_buffer_ctx *ctx) { lib_ring_buffer_commit(&client_config, ctx); lib_ring_buffer_put_cpu(&client_config); } static -void ltt_event_write(struct lib_ring_buffer_ctx *ctx, const void *src, +void ltt_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *src, size_t len) { lib_ring_buffer_write(&client_config, ctx, src, len); @@ -488,8 +503,27 @@ int ltt_is_disabled(struct channel *chan) return lib_ring_buffer_channel_is_disabled(chan); } +static +int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle) +{ + struct lttng_ust_lib_ring_buffer *buf; + int cpu; + + for_each_channel_cpu(cpu, chan) { + int shm_fd, wait_fd; + uint64_t memory_map_size; + + buf = channel_get_ring_buffer(&client_config, chan, + cpu, handle, &shm_fd, &wait_fd, + &memory_map_size); + lib_ring_buffer_switch(&client_config, buf, + SWITCH_ACTIVE, handle); + } + return 0; +} + static struct ltt_transport ltt_relay_transport = { - .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING, + .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap", .ops = { .channel_create = _channel_create, .channel_destroy = ltt_channel_destroy, @@ -503,18 +537,17 @@ static struct ltt_transport ltt_relay_transport = { //.get_hp_wait_queue = ltt_get_hp_wait_queue, .is_finalized = ltt_is_finalized, .is_disabled = ltt_is_disabled, + .flush_buffer = ltt_flush_buffer, }, }; -static -void __attribute__((constructor)) ltt_ring_buffer_client_init(void) +void RING_BUFFER_MODE_TEMPLATE_INIT(void) { DBG("LTT : ltt ring buffer client init\n"); ltt_transport_register(<t_relay_transport); } -static -void __attribute__((destructor)) ltt_ring_buffer_client_exit(void) +void RING_BUFFER_MODE_TEMPLATE_EXIT(void) { DBG("LTT : ltt ring buffer client exit\n"); ltt_transport_unregister(<t_relay_transport);