X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ring-buffer-metadata-client.h;h=0911d37a04ae59512abd1f0c59a1b5bf7b0fd5ad;hb=9af5d97a36b0cd4ed5d5868855f03c810d171aad;hp=2b2aae7dc9920b5a5ce56e9401d3831450ce1cfa;hpb=a880bae51b3d8e927f68ceae2804636976bd62d8;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h index 2b2aae7d..0911d37a 100644 --- a/liblttng-ust/lttng-ring-buffer-metadata-client.h +++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h @@ -6,6 +6,7 @@ * LTTng lib ring buffer client template. */ +#include #include #include @@ -92,13 +93,13 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t lib_ring_buffer_offset_address(&buf->backend, subbuf_idx * chan->backend.subbuf_size, handle); - struct lttng_channel *lttng_chan = channel_get_private(chan); + struct lttng_ust_channel_buffer *lttng_chan = channel_get_private(chan); assert(header); if (!header) return; header->magic = TSDL_MAGIC_NUMBER; - memcpy(header->uuid, lttng_chan->uuid, sizeof(lttng_chan->uuid)); + memcpy(header->uuid, lttng_chan->priv->uuid, sizeof(lttng_chan->priv->uuid)); header->checksum = 0; /* 0 if unused */ header->content_size = 0xFFFFFFFF; /* in bits, for debugging */ header->packet_size = 0xFFFFFFFF; /* in bits, for debugging */ @@ -190,7 +191,7 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = { }; static -struct lttng_channel *_channel_create(const char *name, +struct lttng_ust_channel_buffer *_channel_create(const char *name, void *buf_addr, size_t subbuf_size, size_t num_subbuf, unsigned int switch_timer_interval, @@ -200,33 +201,42 @@ struct lttng_channel *_channel_create(const char *name, const int *stream_fds, int nr_stream_fds, int64_t blocking_timeout) { - struct lttng_channel chan_priv_init; + struct lttng_ust_abi_channel_config chan_priv_init; struct lttng_ust_shm_handle *handle; - struct lttng_channel *lttng_chan; - void *priv; + struct lttng_ust_channel_buffer *lttng_chan_buf; + + lttng_chan_buf = lttng_ust_alloc_channel_buffer(); + if (!lttng_chan_buf) + return NULL; + memcpy(lttng_chan_buf->priv->uuid, uuid, LTTNG_UST_UUID_LEN); + lttng_chan_buf->priv->id = chan_id; memset(&chan_priv_init, 0, sizeof(chan_priv_init)); memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN); chan_priv_init.id = chan_id; + handle = channel_create(&client_config, name, - &priv, __alignof__(struct lttng_channel), - sizeof(struct lttng_channel), + __alignof__(struct lttng_ust_channel_buffer), + sizeof(struct lttng_ust_channel_buffer), &chan_priv_init, - buf_addr, subbuf_size, num_subbuf, + lttng_chan_buf, buf_addr, subbuf_size, num_subbuf, switch_timer_interval, read_timer_interval, stream_fds, nr_stream_fds, blocking_timeout); if (!handle) - return NULL; - lttng_chan = priv; - lttng_chan->handle = handle; - lttng_chan->chan = shmp(handle, handle->chan); - return lttng_chan; + goto error; + lttng_chan_buf->priv->rb_chan = shmp(handle, handle->chan); + return lttng_chan_buf; + +error: + lttng_ust_free_channel_common(lttng_chan_buf->parent); + return NULL; } static -void lttng_channel_destroy(struct lttng_channel *chan) +void lttng_channel_destroy(struct lttng_ust_channel_buffer *lttng_chan_buf) { - channel_destroy(chan->chan, chan->handle, 1); + channel_destroy(lttng_chan_buf->priv->rb_chan, lttng_chan_buf->priv->rb_chan->handle, 1); + lttng_ust_free_channel_common(lttng_chan_buf->parent); } static @@ -257,70 +267,60 @@ void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *sr } static -size_t lttng_packet_avail_size(struct lttng_ust_lib_ring_buffer_channel *chan, - struct lttng_ust_shm_handle *handle) +size_t lttng_packet_avail_size(struct lttng_ust_channel_buffer *chan) { + struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan; unsigned long o_begin; struct lttng_ust_lib_ring_buffer *buf; - buf = shmp(handle, chan->backend.buf[0].shmp); /* Only for global buffer ! */ + buf = shmp(rb_chan->handle, rb_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); + if (subbuf_offset(o_begin, rb_chan) != 0) { + return rb_chan->backend.subbuf_size - subbuf_offset(o_begin, rb_chan); } else { - return chan->backend.subbuf_size - subbuf_offset(o_begin, chan) + return rb_chan->backend.subbuf_size - subbuf_offset(o_begin, rb_chan) - sizeof(struct metadata_packet_header); } } -#if 0 static -wait_queue_head_t *lttng_get_reader_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan) +int lttng_is_finalized(struct lttng_ust_channel_buffer *chan) { - return &chan->read_wait; -} + struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan; -static -wait_queue_head_t *lttng_get_hp_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan) -{ - return &chan->hp_wait; + return lib_ring_buffer_channel_is_finalized(rb_chan); } -#endif //0 static -int lttng_is_finalized(struct lttng_ust_lib_ring_buffer_channel *chan) +int lttng_is_disabled(struct lttng_ust_channel_buffer *chan) { - return lib_ring_buffer_channel_is_finalized(chan); -} + struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan; -static -int lttng_is_disabled(struct lttng_ust_lib_ring_buffer_channel *chan) -{ - return lib_ring_buffer_channel_is_disabled(chan); + return lib_ring_buffer_channel_is_disabled(rb_chan); } static -int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan, - struct lttng_ust_shm_handle *handle) +int lttng_flush_buffer(struct lttng_ust_channel_buffer *chan) { + struct lttng_ust_lib_ring_buffer_channel *rb_chan = chan->priv->rb_chan; struct lttng_ust_lib_ring_buffer *buf; int shm_fd, wait_fd, wakeup_fd; uint64_t memory_map_size; - buf = channel_get_ring_buffer(&client_config, chan, - 0, handle, &shm_fd, &wait_fd, &wakeup_fd, + buf = channel_get_ring_buffer(&client_config, rb_chan, + 0, rb_chan->handle, &shm_fd, &wait_fd, &wakeup_fd, &memory_map_size); lib_ring_buffer_switch(&client_config, buf, - SWITCH_ACTIVE, handle); + SWITCH_ACTIVE, rb_chan->handle); return 0; } static struct lttng_transport lttng_relay_transport = { .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap", .ops = { - .struct_size = sizeof(struct lttng_ust_channel_ops), + .struct_size = sizeof(struct lttng_ust_channel_buffer_ops), - .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, { + .priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_buffer_ops_private, { .pub = <tng_relay_transport.ops, .channel_create = _channel_create, .channel_destroy = lttng_channel_destroy,