X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=f634cd362a74fd810622d8d49c28397c137b4a27;hb=6c1c0768320135c6936c371b09731851b508c023;hp=38820af3811e1893ba8a5f6c6109c31599fb7838;hpb=53efb85a242809ed5ed21e9ab40effa696ecbc6f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 38820af38..f634cd362 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -373,14 +374,11 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
 	DBG("Sending session stream to kernel consumer");
 
-	if (session->metadata_stream_fd >= 0) {
+	if (session->metadata_stream_fd >= 0 && session->metadata) {
 		ret = kernel_consumer_add_metadata(sock, session, monitor);
 		if (ret < 0) {
 			goto error;
 		}
-
-		/* Flag that at least the metadata has been sent to the consumer. */
-		session->consumer_fds_sent = 1;
 	}
 
 	/* Send channel and streams of it */
@@ -404,6 +402,7 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
 	DBG("Kernel consumer FDs of metadata and channel streams sent");
 
+	session->consumer_fds_sent = 1;
 	return 0;
 
 error: