X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=2241acbcaa8ccdf2e6ad250a41ac2fc641ce964c;hb=40d253abbf635c6cf0b938298d56747cf67c11db;hp=83771f2d75c8896d142a705066410c50023acaf4;hpb=df5b86c84d896eb2d74a8757c234492c1d1fc3be;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 83771f2d7..2241acbca 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -15,16 +15,15 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <common/common.h>
 #include <common/defaults.h>
+#include <common/compat/string.h>
 
 #include "consumer.h"
 #include "health-sessiond.h"
@@ -48,9 +47,9 @@ static char *create_channel_path(struct consumer_output *consumer,
 			PERROR("snprintf kernel channel path");
 			goto error;
 		}
-		pathname = strndup(tmp_path, sizeof(tmp_path));
+		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
 		if (!pathname) {
-			PERROR("strndup");
+			PERROR("lttng_strndup");
 			goto error;
 		}
 
@@ -69,9 +68,9 @@ static char *create_channel_path(struct consumer_output *consumer,
 			PERROR("snprintf kernel metadata path");
 			goto error;
 		}
-		pathname = strndup(tmp_path, sizeof(tmp_path));
+		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
 		if (!pathname) {
-			PERROR("strndup");
+			PERROR("lttng_strndup");
 			goto error;
 		}
 		DBG3("Kernel network consumer subdir path: %s", pathname);
@@ -339,7 +338,7 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 
 	/* Send streams */
 	cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
-		if (!stream->fd) {
+		if (!stream->fd || stream->sent_to_consumer) {
 			continue;
 		}
 
@@ -349,6 +348,7 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 		if (ret < 0) {
 			goto error;
 		}
+		stream->sent_to_consumer = true;
 	}
 
 error: