X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.c;h=f989bfd1361be36bd20d4edfa018f36b11de062b;hb=d49b54aade558422c35ecf9d62a33bf19b80cc51;hp=c59bb9416b1c9609ca34884cbc6126daf1295b78;hpb=f8f3885cc52af9d3c951da78989d6f4a25270411;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index c59bb9416..f989bfd13 100644
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -86,7 +86,6 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
 	stream = zmalloc(sizeof(struct relay_stream));
 	if (stream == NULL) {
 		PERROR("relay stream zmalloc");
-		ret = -1;
 		goto error_no_alloc;
 	}
 
@@ -98,6 +97,7 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
 	stream->tracefile_count = tracefile_count;
 	stream->path_name = path_name;
 	stream->channel_name = channel_name;
+	stream->beacon_ts_end = -1ULL;
 	lttng_ht_node_init_u64(&stream->node, stream->stream_handle);
 	pthread_mutex_init(&stream->lock, NULL);
 	pthread_mutex_init(&stream->reflock, NULL);
@@ -345,7 +345,15 @@ void stream_put(struct relay_stream *stream)
 
 void try_stream_close(struct relay_stream *stream)
 {
+	bool session_aborted;
+	struct relay_session *session = stream->trace->session;
+
 	DBG("Trying to close stream %" PRIu64, stream->stream_handle);
+
+	pthread_mutex_lock(&session->lock);
+	session_aborted = session->aborted;
+	pthread_mutex_unlock(&session->lock);
+
 	pthread_mutex_lock(&stream->lock);
 	/*
 	 * Can be called concurently by connection close and reception of last
@@ -387,7 +395,8 @@ 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_seq - stream->last_net_seq_num)) < 0
+			&& !session_aborted) {
 		/*
 		 * Don't close since we still have data pending. This
 		 * handles cases where an explicit close command has