X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-metadata-client.h;h=d1a83d5389e9a45ae1ffb468f56b4bb4b3cc82c0;hb=f3049ad9e7b72287888452b9ed542c0f36e6eefe;hp=1ea41176b123ece92d855fb80cd022cef52f0256;hpb=9f3fdbc68877e1f12b6cedb15ef76d9af9b48bac;p=lttng-ust.git diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h index 1ea41176..d1a83d53 100644 --- a/libust/ltt-ring-buffer-metadata-client.h +++ b/libust/ltt-ring-buffer-metadata-client.h @@ -9,8 +9,8 @@ */ #include -#include "ust/bitfield.h" -#include "ltt-events.h" +#include +#include "lttng/bitfield.h" #include "ltt-tracer.h" #include "../libringbuffer/frontend_types.h" @@ -23,6 +23,8 @@ struct metadata_packet_header { uint8_t compression_scheme; /* 0 if unused */ uint8_t encryption_scheme; /* 0 if unused */ uint8_t checksum_scheme; /* 0 if unused */ + uint8_t major; /* CTF spec major version number */ + uint8_t minor; /* CTF spec minor version number */ uint8_t header_end[0]; }; @@ -30,7 +32,7 @@ struct metadata_record_header { uint8_t header_end[0]; /* End of header */ }; -static const struct lib_ring_buffer_config client_config; +static const struct lttng_ust_lib_ring_buffer_config client_config; static inline u64 lib_ring_buffer_clock_read(struct channel *chan) @@ -39,10 +41,10 @@ u64 lib_ring_buffer_clock_read(struct channel *chan) } 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) { return 0; } @@ -55,10 +57,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 0; } @@ -75,14 +77,16 @@ static size_t client_packet_header_size(void) return offsetof(struct metadata_packet_header, header_end); } -static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc, - unsigned int subbuf_idx) +static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, + unsigned int subbuf_idx, + struct lttng_ust_shm_handle *handle) { - struct channel *chan = shmp(buf->backend.chan); + struct channel *chan = shmp(handle, buf->backend.chan); struct metadata_packet_header *header = (struct metadata_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; @@ -94,20 +98,25 @@ static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc, header->compression_scheme = 0; /* 0 if unused */ header->encryption_scheme = 0; /* 0 if unused */ header->checksum_scheme = 0; /* 0 if unused */ + header->major = CTF_SPEC_MAJOR; + header->minor = CTF_SPEC_MINOR; + } /* * 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, - unsigned int subbuf_idx, unsigned long data_size) +static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, u64 tsc, + unsigned int subbuf_idx, unsigned long data_size, + struct lttng_ust_shm_handle *handle) { - struct channel *chan = shmp(buf->backend.chan); + struct channel *chan = shmp(handle, buf->backend.chan); struct metadata_packet_header *header = (struct metadata_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->content_size = data_size * CHAR_BIT; /* in bits */ @@ -118,17 +127,20 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc, WARN_ON_ONCE(records_lost != 0); } -static int client_buffer_create(struct lib_ring_buffer *buf, void *priv, - int cpu, const char *name) +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) +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, @@ -142,75 +154,86 @@ static const struct lib_ring_buffer_config client_config = { .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, - int *shmid) + 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, shmid); + 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 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; - buf = channel_get_ring_buffer(&client_config, chan, 0); - if (!lib_ring_buffer_open_read(buf)) + buf = channel_get_ring_buffer(&client_config, chan, + 0, 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 lttng_ust_lib_ring_buffer *buf, + struct lttng_ust_shm_handle *handle) { - lib_ring_buffer_release_read(buf); + lib_ring_buffer_release_read(buf, handle, 0); } static -int ltt_event_reserve(struct lib_ring_buffer_ctx *ctx, uint32_t event_id) +int ltt_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id) { return lib_ring_buffer_reserve(&client_config, ctx); } 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); } 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); } static -size_t ltt_packet_avail_size(struct channel *chan) +size_t ltt_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle *handle) { unsigned long o_begin; - struct lib_ring_buffer *buf; + struct lttng_ust_lib_ring_buffer *buf; - buf = shmp(chan->backend.buf); /* Only for global buffer ! */ + buf = shmp(handle, chan->backend.buf[0].shmp); /* Only for global buffer ! */ o_begin = v_read(&client_config, &buf->offset); if (subbuf_offset(o_begin, chan) != 0) { return chan->backend.subbuf_size - subbuf_offset(o_begin, chan); @@ -246,8 +269,23 @@ 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 shm_fd, wait_fd; + uint64_t memory_map_size; + + buf = channel_get_ring_buffer(&client_config, chan, + 0, 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, @@ -261,19 +299,18 @@ 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) { - printf("LTT : ltt ring buffer client init\n"); + 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) { - printf("LTT : ltt ring buffer client exit\n"); + DBG("LTT : ltt ring buffer client exit\n"); ltt_transport_unregister(<t_relay_transport); }