X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-metadata-client.h;h=00c07fc57e80e47f6dda25be958a911bf4eca08d;hb=1b2c2540d02d98833e3243284e0833fd3799a5a7;hp=8b1079d98c7c930dced941601533b9a407a272d1;hpb=3d1fc7fd48d566eeb6e248de477995b789b094c7;p=ust.git diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h index 8b1079d..00c07fc 100644 --- a/libust/ltt-ring-buffer-metadata-client.h +++ b/libust/ltt-ring-buffer-metadata-client.h @@ -8,11 +8,11 @@ * Dual LGPL v2.1/GPL v2 license. */ -#include -#include -#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */ -#include "ltt-events.h" +#include +#include +#include "ust/bitfield.h" #include "ltt-tracer.h" +#include "../libringbuffer/frontend_types.h" struct metadata_packet_header { uint32_t magic; /* 0x75D11D57 */ @@ -47,7 +47,7 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config, return 0; } -#include "wrapper/ringbuffer/api.h" +#include "../libringbuffer/api.h" static u64 client_ring_buffer_clock_read(struct channel *chan) { @@ -76,18 +76,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 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; header->magic = TSDL_MAGIC_NUMBER; - memcpy(header->uuid, session->uuid.b, sizeof(session->uuid)); + memcpy(header->uuid, session->uuid, sizeof(session->uuid)); header->checksum = 0; /* 0 if unused */ header->content_size = 0xFFFFFFFF; /* in bits, for debugging */ header->packet_size = 0xFFFFFFFF; /* in bits, for debugging */ @@ -101,13 +103,15 @@ 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 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 */ @@ -119,12 +123,15 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc, } 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) { } @@ -142,45 +149,51 @@ 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) { - 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); + 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); } 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) { struct 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); + if (!lib_ring_buffer_open_read(buf, handle)) 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); } static @@ -203,13 +216,13 @@ void ltt_event_write(struct lib_ring_buffer_ctx *ctx, const void *src, } static -size_t ltt_packet_avail_size(struct channel *chan) +size_t ltt_packet_avail_size(struct channel *chan, struct shm_handle *handle) { unsigned long o_begin; struct lib_ring_buffer *buf; - buf = 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); @@ -219,6 +232,7 @@ size_t ltt_packet_avail_size(struct channel *chan) } } +#if 0 static wait_queue_head_t *ltt_get_reader_wait_queue(struct channel *chan) { @@ -230,6 +244,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) @@ -244,8 +259,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, @@ -255,36 +269,23 @@ static struct ltt_transport ltt_relay_transport = { .event_commit = ltt_event_commit, .event_write = ltt_event_write, .packet_avail_size = ltt_packet_avail_size, - .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) +static +void __attribute__((constructor)) ltt_ring_buffer_client_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 metadata 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) +static +void __attribute__((destructor)) ltt_ring_buffer_client_exit(void) { - printk(KERN_INFO "LTT : ltt ring buffer metadata 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");