X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=b0a52b33ad49ca196d62326330e70750b7028190;hb=8f0044bfed9f5ca51eab51478f483f92cc8f84a7;hp=f0e3ce92a192cbaad2e2b9f42a29f8a1e407eb42;hpb=52898cb1ecfe2cf37bda9b95039826da517b9a5b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index f0e3ce92a..b0a52b33a 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -28,7 +28,7 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
-#include "health.h"
+#include "health-sessiond.h"
 #include "ust-consumer.h"
 #include "buffer-registry.h"
 #include "session.h"
@@ -102,7 +102,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 		struct ust_app_channel *ua_chan, struct consumer_output *consumer,
 		struct consumer_socket *socket, struct ust_registry_session *registry)
 {
-	int ret;
+	int ret, output;
 	uint32_t chan_id;
 	uint64_t key, chan_reg_key;
 	char *pathname = NULL;
@@ -141,13 +141,21 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 		chan_id = chan_reg->chan_id;
 	}
 
+	switch (ua_chan->attr.output) {
+	case LTTNG_UST_MMAP:
+	default:
+		output = LTTNG_EVENT_MMAP;
+		break;
+	}
+
 	consumer_init_ask_channel_comm_msg(&msg,
 			ua_chan->attr.subbuf_size,
 			ua_chan->attr.num_subbuf,
 			ua_chan->attr.overwrite,
 			ua_chan->attr.switch_timer_interval,
 			ua_chan->attr.read_timer_interval,
-			(int) ua_chan->attr.output,
+			ua_sess->live_timer_interval,
+			output,
 			(int) ua_chan->attr.type,
 			ua_sess->tracing_id,
 			pathname,
@@ -207,7 +215,6 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 	assert(ua_chan);
 	assert(consumer);
 	assert(socket);
-	assert(socket->fd);
 	assert(registry);
 
 	if (!consumer->enabled) {
@@ -242,7 +249,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 
 	assert(ua_chan);
 	assert(socket);
-	assert(socket->fd);
 
 	msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
 	msg.u.get_channel.key = ua_chan->key;
@@ -257,11 +263,11 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 	}
 
 	/* First, get the channel from consumer. */
-	ret = ustctl_recv_channel_from_consumer(*socket->fd, &ua_chan->obj);
+	ret = ustctl_recv_channel_from_consumer(*socket->fd_ptr, &ua_chan->obj);
 	if (ret < 0) {
 		if (ret != -EPIPE) {
 			ERR("Error recv channel from consumer %d with ret %d",
-					*socket->fd, ret);
+					*socket->fd_ptr, ret);
 		} else {
 			DBG3("UST app recv channel from consumer. Consumer is dead.");
 		}
@@ -280,7 +286,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 		}
 
 		/* Stream object is populated by this call if successful. */
-		ret = ustctl_recv_stream_from_consumer(*socket->fd, &stream->obj);
+		ret = ustctl_recv_stream_from_consumer(*socket->fd_ptr, &stream->obj);
 		if (ret < 0) {
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
@@ -290,7 +296,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 			}
 			if (ret != -EPIPE) {
 				ERR("Recv stream from consumer %d with ret %d",
-						*socket->fd, ret);
+						*socket->fd_ptr, ret);
 			} else {
 				DBG3("UST app recv stream from consumer. Consumer is dead.");
 			}
@@ -337,7 +343,6 @@ int ust_consumer_destroy_channel(struct consumer_socket *socket,
 
 	assert(ua_chan);
 	assert(socket);
-	assert(socket->fd);
 
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
 	msg.u.destroy_channel.key = ua_chan->key;