X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=86af682b110024c5b1c6f73bb4b34d4ccc29d648;hb=a0a3bef9e447a220a36fb7cb4c3f60e4eafdec4d;hp=096a22fca27caea8297dc6484f5e354aa9ae8017;hpb=1849ef7cdc349bef4b6f6eb4a50058e06c26d431;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 096a22fc..86af682b 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -178,10 +178,14 @@ static const char *str_timeout;
 static int got_timeout_env;
 
 extern void lttng_ring_buffer_client_overwrite_init(void);
+extern void lttng_ring_buffer_client_overwrite_rt_init(void);
 extern void lttng_ring_buffer_client_discard_init(void);
+extern void lttng_ring_buffer_client_discard_rt_init(void);
 extern void lttng_ring_buffer_metadata_client_init(void);
 extern void lttng_ring_buffer_client_overwrite_exit(void);
+extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
 extern void lttng_ring_buffer_client_discard_exit(void);
+extern void lttng_ring_buffer_client_discard_rt_exit(void);
 extern void lttng_ring_buffer_metadata_client_exit(void);
 
 /*
@@ -467,9 +471,11 @@ int handle_message(struct sock_info *sock_info,
 	case LTTNG_UST_CHANNEL:
 	{
 		void *chan_data;
+		int wakeup_fd;
 
 		len = ustcomm_recv_channel_from_sessiond(sock,
-				&chan_data, lum->u.channel.len);
+				&chan_data, lum->u.channel.len,
+				&wakeup_fd);
 		switch (len) {
 		case 0:	/* orderly shutdown */
 			ret = 0;
@@ -494,6 +500,7 @@ int handle_message(struct sock_info *sock_info,
 			}
 		}
 		args.channel.chan_data = chan_data;
+		args.channel.wakeup_fd = wakeup_fd;
 		if (ops->cmd)
 			ret = ops->cmd(lum->handle, lum->cmd,
 					(unsigned long) &lum->u,
@@ -1113,7 +1120,10 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	init_tracepoint();
 	lttng_ring_buffer_metadata_client_init();
 	lttng_ring_buffer_client_overwrite_init();
+	lttng_ring_buffer_client_overwrite_rt_init();
 	lttng_ring_buffer_client_discard_init();
+	lttng_ring_buffer_client_discard_rt_init();
+	lttng_context_init();
 
 	timeout_mode = get_constructor_timeout(&constructor_timeout);
 
@@ -1216,7 +1226,10 @@ void lttng_ust_cleanup(int exiting)
 	 */
 	lttng_ust_abi_exit();
 	lttng_ust_events_exit();
+	lttng_context_exit();
+	lttng_ring_buffer_client_discard_rt_exit();
 	lttng_ring_buffer_client_discard_exit();
+	lttng_ring_buffer_client_overwrite_rt_exit();
 	lttng_ring_buffer_client_overwrite_exit();
 	lttng_ring_buffer_metadata_client_exit();
 	exit_tracepoint();