X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-metadata-client.h;h=8a5943972bbcc0e911047ae14fa740e2dae35262;hb=7433d32d5a8f0e8833461b586a8c8b2274da0141;hp=ae606b4cc21a577cd0b85746ef273d8bc4f357a4;hpb=5198080d2234eb06e95d245d0a9747810f496475;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 ae606b4c..8a594397 100644
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h
@@ -92,13 +92,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 +190,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 +200,43 @@ 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->handle = handle;
+	lttng_chan_buf->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->chan, lttng_chan_buf->handle, 1);
+	lttng_ust_free_channel_common(lttng_chan_buf->parent);
 }
 
 static
@@ -320,15 +330,18 @@ static struct lttng_transport lttng_relay_transport = {
 	.ops = {
 		.struct_size = sizeof(struct lttng_ust_channel_ops),
 
-		.channel_create = _channel_create,
-		.channel_destroy = lttng_channel_destroy,
+		.priv = __LTTNG_COMPOUND_LITERAL(struct lttng_ust_channel_ops_private, {
+			.pub = &lttng_relay_transport.ops,
+			.channel_create = _channel_create,
+			.channel_destroy = lttng_channel_destroy,
+			.packet_avail_size = lttng_packet_avail_size,
+			.is_finalized = lttng_is_finalized,
+			.is_disabled = lttng_is_disabled,
+			.flush_buffer = lttng_flush_buffer,
+		}),
 		.event_reserve = lttng_event_reserve,
 		.event_commit = lttng_event_commit,
 		.event_write = lttng_event_write,
-		.packet_avail_size = lttng_packet_avail_size,
-		.is_finalized = lttng_is_finalized,
-		.is_disabled = lttng_is_disabled,
-		.flush_buffer = lttng_flush_buffer,
 	},
 	.client_config = &client_config,
 };