X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-relayd%2Fstream.c;h=ac880e7e5ddb053be06500e9604e0f45d07bf203;hb=a8f9f353edcfac878ed6977381e3030608bf4e92;hp=709b3b1f5e7af9d135a24b0b3d67a957f6f3fcbe;hpb=5312a3edd938117cb5670de711f237e7b6f2e68c;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index 709b3b1f5..ac880e7e5 100644
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -68,7 +68,8 @@ end:
 struct relay_stream *stream_create(struct ctf_trace *trace,
 	uint64_t stream_handle, char *path_name,
 	char *channel_name, uint64_t tracefile_size,
-	uint64_t tracefile_count)
+	uint64_t tracefile_count,
+	const struct relay_stream_chunk_id *chunk_id)
 {
 	int ret;
 	struct relay_stream *stream = NULL;
@@ -81,7 +82,8 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
 	}
 
 	stream->stream_handle = stream_handle;
-	stream->prev_seq = -1ULL;
+	stream->prev_data_seq = -1ULL;
+	stream->prev_index_seq = -1ULL;
 	stream->last_net_seq_num = -1ULL;
 	stream->ctf_stream_id = -1ULL;
 	stream->tracefile_size = tracefile_size;
@@ -94,6 +96,7 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
 	urcu_ref_init(&stream->ref);
 	ctf_trace_get(trace);
 	stream->trace = trace;
+	stream->current_chunk_id = *chunk_id;
 
 	stream->indexes_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
 	if (!stream->indexes_ht) {
@@ -374,7 +377,7 @@ void try_stream_close(struct relay_stream *stream)
 	}
 
 	if (stream->last_net_seq_num != -1ULL &&
-			((int64_t) (stream->prev_seq - stream->last_net_seq_num)) < 0
+			((int64_t) (stream->prev_data_seq - stream->last_net_seq_num)) < 0
 			&& !session_aborted) {
 		/*
 		 * Don't close since we still have data pending. This