X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=57828b7208fd7dec64ec6db55065b8aaacfa71af;hb=fd5f765ddad09f7f0395544bfa2b4ea5f624966a;hp=46ee31cc28bfc2b7026f03e9ceb4faa7c576c4e9;hpb=111649015cedad3c460926c363a5a781c2b384b9;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 46ee31cc2..57828b720 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -920,6 +920,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		unsigned int switch_timer_interval,
 		unsigned int read_timer_interval,
 		unsigned int live_timer_interval,
+		bool is_in_live_session,
 		unsigned int monitor_timer_interval,
 		int output,
 		int type,
@@ -966,6 +967,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 	msg->u.ask_channel.switch_timer_interval = switch_timer_interval;
 	msg->u.ask_channel.read_timer_interval = read_timer_interval;
 	msg->u.ask_channel.live_timer_interval = live_timer_interval;
+	msg->u.ask_channel.is_live = is_in_live_session;
 	msg->u.ask_channel.monitor_timer_interval = monitor_timer_interval;
 	msg->u.ask_channel.output = output;
 	msg->u.ask_channel.type = type;
@@ -1021,6 +1023,7 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t tracefile_count,
 		unsigned int monitor,
 		unsigned int live_timer_interval,
+		bool is_in_live_session,
 		unsigned int monitor_timer_interval,
 		struct lttng_trace_chunk *trace_chunk)
 {
@@ -1050,6 +1053,7 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 	msg->u.channel.tracefile_count = tracefile_count;
 	msg->u.channel.monitor = monitor;
 	msg->u.channel.live_timer_interval = live_timer_interval;
+	msg->u.channel.is_live = is_in_live_session;
 	msg->u.channel.monitor_timer_interval = monitor_timer_interval;
 
 	strncpy(msg->u.channel.pathname, pathname,
@@ -1190,7 +1194,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 	}
 
 	DBG3("Sending relayd socket file descriptor to consumer");
-	ret = consumer_send_fds(consumer_sock, &rsock->sock.fd, 1);
+	ret = consumer_send_fds(consumer_sock, ALIGNED_CONST_PTR(rsock->sock.fd), 1);
 	if (ret < 0) {
 		goto error;
 	}