X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.c;h=b033dda94d1f39baf70d52ff50a43a7dc6ed797c;hp=e9c7ad172bc0d2f0e44ff3925ae929bd0b8e1398;hb=f465e9787f5b70d4a8f3761c60b8d6e4161e9628;hpb=06a6840183b2f0415d4843313ba50c1562d5f212

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index e9c7ad172..b033dda94 100644
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -123,13 +123,8 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
 	 * No need to use run_as API here because whatever we receive,
 	 * the relayd uses its own credentials for the stream files.
 	 */
-	ret = utils_create_stream_file(stream->path_name, stream->channel_name,
-			stream->tracefile_size, 0, -1, -1, NULL);
-	if (ret < 0) {
-		ERR("Create output file");
-		goto end;
-	}
-	stream->stream_fd = stream_fd_create(ret);
+	stream->stream_fd = stream_fd_create(stream->path_name,
+			stream->channel_name, stream->tracefile_size, 0, NULL);
 	if (!stream->stream_fd) {
 		if (close(ret)) {
 			PERROR("Error closing file %d", ret);
@@ -307,7 +302,7 @@ static void stream_release(struct urcu_ref *ref)
 		stream->stream_fd = NULL;
 	}
 	if (stream->index_file) {
-		lttng_index_file_put(stream->index_file);
+		relay_index_file_put(stream->index_file);
 		stream->index_file = NULL;
 	}
 	if (stream->trace) {
@@ -384,6 +379,7 @@ void try_stream_close(struct relay_stream *stream)
 		 * a packet. Since those are sent in that order, we take
 		 * care of consumerd crashes.
 		 */
+		DBG("relay_index_close_partial_fd");
 		relay_index_close_partial_fd(stream);
 		/*
 		 * Use the highest net_seq_num we currently have pending
@@ -391,6 +387,7 @@ void try_stream_close(struct relay_stream *stream)
 		 * at -1ULL if we cannot find any index.
 		 */
 		stream->last_net_seq_num = relay_index_find_last(stream);
+		DBG("Updating stream->last_net_seq_num to %" PRIu64, stream->last_net_seq_num);
 		/* Fall-through into the next check. */
 	}