X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fltt-ring-buffer-client.h;h=8844ae28cf8944650f99fcc7c3f2a833e15bd1d7;hb=4ab44fbe7377ad603da7dccebf2e0af6b768fa91;hp=a1bc8c32d1a43a8314bb6ec4cf3248b55c60c05b;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-ring-buffer-client.h b/liblttng-ust/ltt-ring-buffer-client.h
index a1bc8c32..8844ae28 100644
--- a/liblttng-ust/ltt-ring-buffer-client.h
+++ b/liblttng-ust/ltt-ring-buffer-client.h
@@ -305,10 +305,9 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, u64 tsc,
 				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 = CTF_MAGIC_NUMBER;
-	memcpy(header->uuid, session->uuid, sizeof(session->uuid));
+	memcpy(header->uuid, ltt_chan->uuid, sizeof(ltt_chan->uuid));
 	header->stream_id = ltt_chan->id;
 	header->ctx.timestamp_begin = tsc;
 	header->ctx.timestamp_end = 0;
@@ -375,23 +374,35 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = {
 	.oops = RING_BUFFER_OOPS_CONSISTENCY,
 	.ipi = RING_BUFFER_NO_IPI_BARRIER,
 	.wakeup = RING_BUFFER_WAKEUP_BY_WRITER,
+	.client_type = LTTNG_CLIENT_TYPE,
 };
 
+const struct lttng_ust_lib_ring_buffer_client_cb *LTTNG_CLIENT_CALLBACKS = &client_config.cb;
+
 static
 struct ltt_channel *_channel_create(const char *name,
-				struct ltt_channel *ltt_chan, void *buf_addr,
+				void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval,
 				int *shm_fd, int *wait_fd,
-				uint64_t *memory_map_size)
+				uint64_t *memory_map_size,
+				struct ltt_channel *chan_priv_init)
 {
-	ltt_chan->handle = channel_create(&client_config, name, ltt_chan, buf_addr,
-			      subbuf_size, num_subbuf, switch_timer_interval,
-			      read_timer_interval, shm_fd, wait_fd,
-			      memory_map_size);
-	if (!ltt_chan->handle)
+	void *priv;
+	struct ltt_channel *ltt_chan = NULL;
+	struct lttng_ust_shm_handle *handle;
+
+	handle = channel_create(&client_config, name,
+			&priv, __alignof__(*ltt_chan), sizeof(*ltt_chan),
+			chan_priv_init,
+			buf_addr, subbuf_size, num_subbuf,
+			switch_timer_interval, read_timer_interval,
+			shm_fd, wait_fd, memory_map_size);
+	if (!handle)
 		return NULL;
+	ltt_chan = priv;
+	ltt_chan->handle = handle;
 	ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan);
 	return ltt_chan;
 }