X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ring-buffer-client.h;h=72b6d2c8f1a21a2328f726eb94b50d6503929cd2;hb=95935cdd47dda0c644c6f6b18f714ce811fe6b2c;hp=8c531cbf36999b6e73a64de8a033199053ce9c98;hpb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index 8c531cbf..72b6d2c8 100644
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -402,7 +402,7 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = {
 	.output = RING_BUFFER_MMAP,
 	.oops = RING_BUFFER_OOPS_CONSISTENCY,
 	.ipi = RING_BUFFER_NO_IPI_BARRIER,
-	.wakeup = RING_BUFFER_WAKEUP_BY_WRITER,
+	.wakeup = LTTNG_CLIENT_WAKEUP,
 	.client_type = LTTNG_CLIENT_TYPE,
 };
 
@@ -414,7 +414,8 @@ struct lttng_channel *_channel_create(const char *name,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval,
-				unsigned char *uuid)
+				unsigned char *uuid,
+				uint32_t chan_id)
 {
 	struct lttng_channel chan_priv_init;
 	struct lttng_ust_shm_handle *handle;
@@ -423,8 +424,10 @@ struct lttng_channel *_channel_create(const char *name,
 
 	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__(*lttng_chan), sizeof(*lttng_chan),
+			&priv, __alignof__(struct lttng_channel),
+			sizeof(struct lttng_channel),
 			&chan_priv_init,
 			buf_addr, subbuf_size, num_subbuf,
 			switch_timer_interval, read_timer_interval);
@@ -556,12 +559,14 @@ static struct lttng_transport lttng_relay_transport = {
 
 void RING_BUFFER_MODE_TEMPLATE_INIT(void)
 {
-	DBG("LTT : ltt ring buffer client init\n");
+	DBG("LTT : ltt ring buffer client \"%s\" init\n",
+		"relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap");
 	lttng_transport_register(&lttng_relay_transport);
 }
 
 void RING_BUFFER_MODE_TEMPLATE_EXIT(void)
 {
-	DBG("LTT : ltt ring buffer client exit\n");
+	DBG("LTT : ltt ring buffer client \"%s\" exit\n",
+		"relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap");
 	lttng_transport_unregister(&lttng_relay_transport);
 }