X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=a8a11dcee41729f56da30f1f34e62b0a7fa3b4b2;hb=4421f712a81faad99bb5f20369c276803aeba381;hp=308798eb1019943652e1d50ef67f7c1de9c2ae81;hpb=ecc48a904cc7c419fd1400afaa9ccb93be490cdd;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 308798eb1..a8a11dcee 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,6 +141,13 @@ 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,
@@ -148,7 +155,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_chan->attr.switch_timer_interval,
 			ua_chan->attr.read_timer_interval,
 			ua_sess->live_timer_interval,
-			(int) ua_chan->attr.output,
+			output,
 			(int) ua_chan->attr.type,
 			ua_sess->tracing_id,
 			pathname,
@@ -243,6 +250,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 	assert(ua_chan);
 	assert(socket);
 
+	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
 	msg.u.get_channel.key = ua_chan->key;
 
@@ -337,6 +345,7 @@ int ust_consumer_destroy_channel(struct consumer_socket *socket,
 	assert(ua_chan);
 	assert(socket);
 
+	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
 	msg.u.destroy_channel.key = ua_chan->key;
 
@@ -374,8 +383,8 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app,
 	ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-			ERR("Error ustctl send stream %s to app pid: %d with ret %d",
-					stream->name, app->pid, ret);
+			ERR("ustctl send stream handle %d to app pid: %d with ret %d",
+					stream->obj->handle, app->pid, ret);
 		} else {
 			DBG3("UST app send stream to ust failed. Application is dead.");
 		}
@@ -462,6 +471,7 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 			DBG("PID registry not found for session id %" PRIu64,
 					request.session_id_per_pid);
 
+			memset(&msg, 0, sizeof(msg));
 			msg.cmd_type = LTTNG_ERR_UND;
 			(void) consumer_send_msg(socket, &msg);
 			/*