X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-metadata-client.h;h=f4d1362a6e9b95303349483a574842815a96ed77;hb=035d76882df8f333e828ada2ed328c38169dccdd;hp=8a5943972bbcc0e911047ae14fa740e2dae35262;hpb=e7bc0ef6c86ae97886cf5f8b28854cf281d4962b;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 8a594397..f4d1362a 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 <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -14,6 +15,7 @@
 #include "ust-compat.h"
 #include "lttng-tracer.h"
 #include "../libringbuffer/frontend_types.h"
+#include <urcu/tls-compat.h>
 
 struct metadata_packet_header {
 	uint32_t magic;			/* 0x75D11D57 */
@@ -35,6 +37,9 @@ struct metadata_record_header {
 
 static const struct lttng_ust_lib_ring_buffer_config client_config;
 
+/* No nested use supported for metadata ring buffer. */
+static DEFINE_URCU_TLS(struct lttng_ust_lib_ring_buffer_ctx_private, private_ctx);
+
 static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	return 0;
@@ -223,8 +228,7 @@ struct lttng_ust_channel_buffer *_channel_create(const char *name,
 			stream_fds, nr_stream_fds, blocking_timeout);
 	if (!handle)
 		goto error;
-	lttng_chan_buf->handle = handle;
-	lttng_chan_buf->chan = shmp(handle, handle->chan);
+	lttng_chan_buf->priv->rb_chan = shmp(handle, handle->chan);
 	return lttng_chan_buf;
 
 error:
@@ -235,20 +239,24 @@ error:
 static
 void lttng_channel_destroy(struct lttng_ust_channel_buffer *lttng_chan_buf)
 {
-	channel_destroy(lttng_chan_buf->chan, lttng_chan_buf->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
-int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t event_id)
+int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx)
 {
 	int ret;
 
+	memset(&URCU_TLS(private_ctx), 0, sizeof(struct lttng_ust_lib_ring_buffer_ctx_private));
+	URCU_TLS(private_ctx).pub = ctx;
+	URCU_TLS(private_ctx).chan = ctx->client_priv;
+	ctx->priv = &URCU_TLS(private_ctx);
 	ret = lib_ring_buffer_reserve(&client_config, ctx, NULL);
 	if (ret)
 		return ret;
 	if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
-			&ctx->backend_pages))
+			&ctx->priv->backend_pages))
 		return -EPERM;
 	return 0;
 }
@@ -260,77 +268,68 @@ void lttng_event_commit(struct lttng_ust_lib_ring_buffer_ctx *ctx)
 }
 
 static
-void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *src,
-		     size_t len)
+void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+		const void *src, size_t len, size_t alignment)
 {
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, alignment);
 	lib_ring_buffer_write(&client_config, ctx, src, len);
 }
 
 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 = &lttng_relay_transport.ops,
 			.channel_create = _channel_create,
 			.channel_destroy = lttng_channel_destroy,