X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=5581dce191dc760e324a966c331e14b88bc7fc45;hb=6bf5e7c9c58c736978108e197e1b529471ff3ac7;hp=b558988dcf1a2ba4fcf6b6cabdff46c7166bbf25;hpb=1624d5b7ba86633d36f3a5c86ea1df5d308c4360;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index b558988dc..5581dce19 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -38,6 +38,7 @@
 #include <common/compat/fcntl.h>
 #include <common/consumer-metadata-cache.h>
 #include <common/consumer-timer.h>
+#include <common/utils.h>
 
 #include "ust-consumer.h"
 
@@ -222,7 +223,9 @@ static int send_stream_to_relayd(struct lttng_consumer_stream *stream)
 		pthread_mutex_lock(&relayd->ctrl_sock_mutex);
 		/* Add stream on the relayd */
 		ret = relayd_add_stream(&relayd->control_sock, stream->name,
-				stream->chan->pathname, &stream->relayd_stream_id);
+				stream->chan->pathname, &stream->relayd_stream_id,
+				stream->chan->tracefile_size,
+				stream->chan->tracefile_count);
 		pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 		if (ret < 0) {
 			goto error;
@@ -1283,10 +1286,28 @@ end:
 
 /*
  * Called when a stream is created.
+ *
+ * Return 0 on success or else a negative value.
  */
 int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 {
-	return lttng_create_output_file(stream);
+	int ret;
+
+	/* Don't create anything if this is set for streaming. */
+	if (stream->net_seq_idx == (uint64_t) -1ULL) {
+		ret = utils_create_stream_file(stream->chan->pathname, stream->name,
+				stream->chan->tracefile_size, stream->tracefile_count_current,
+				stream->uid, stream->gid);
+		if (ret < 0) {
+			goto error;
+		}
+		stream->out_fd = ret;
+		stream->tracefile_size_current = 0;
+	}
+	ret = 0;
+
+error:
+	return ret;
 }
 
 /*