X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-client.h;h=6361b9edeb912e0a8f543483e6c67e30d527328c;hb=4cfec15c93af7e0cfe3ce769ee90486bb8ab7c37;hp=5f5c31588356f7f78631112eb4e34d004c576c9a;hpb=824f40b81426c6ac82685251018dae00947786a9;p=lttng-ust.git diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h index 5f5c3158..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 = @@ -345,17 +347,17 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc, 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, @@ -401,12 +403,12 @@ void ltt_channel_destroy(struct ltt_channel *ltt_chan) } 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) { @@ -420,14 +422,14 @@ struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan, } 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, 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); @@ -462,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); @@ -501,6 +503,25 @@ 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 "-mmap", .ops = { @@ -516,6 +537,7 @@ 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, }, };