X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.c;h=04ff467de95b637fda1f2943c3042c591426d2a1;hb=ce4d40839ac3beef1a58730d3636a522497bc60f;hp=02bf9dd54995ed2aab6d026ecb578d9127610908;hpb=36d2e35df61339e4394e84ad9790b984d259e0f0;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index 02bf9dd54..04ff467de 100644
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -17,7 +17,6 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <common/common.h>
 #include <common/utils.h>
@@ -33,16 +32,7 @@
 /* Should be called with RCU read-side lock held. */
 bool stream_get(struct relay_stream *stream)
 {
-	bool has_ref = false;
-
-	pthread_mutex_lock(&stream->reflock);
-	if (stream->ref.refcount != 0) {
-		has_ref = true;
-		urcu_ref_get(&stream->ref);
-	}
-	pthread_mutex_unlock(&stream->reflock);
-
-	return has_ref;
+	return urcu_ref_get_unless_zero(&stream->ref);
 }
 
 /*
@@ -101,7 +91,6 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
 	stream->channel_name = channel_name;
 	lttng_ht_node_init_u64(&stream->node, stream->stream_handle);
 	pthread_mutex_init(&stream->lock, NULL);
-	pthread_mutex_init(&stream->reflock, NULL);
 	urcu_ref_init(&stream->ref);
 	ctf_trace_get(trace);
 	stream->trace = trace;
@@ -228,8 +217,7 @@ unlock:
 
 /*
  * Stream must be protected by holding the stream lock or by virtue of being
- * called from stream_destroy, in which case it is guaranteed to be accessed
- * from a single thread by the reflock.
+ * called from stream_destroy.
  */
 static void stream_unpublish(struct relay_stream *stream)
 {
@@ -279,9 +267,6 @@ static void stream_destroy_rcu(struct rcu_head *rcu_head)
 /*
  * No need to take stream->lock since this is only called on the final
  * stream_put which ensures that a single thread may act on the stream.
- *
- * At that point, the object is also protected by the reflock which
- * guarantees that no other thread may share ownership of this stream.
  */
 static void stream_release(struct urcu_ref *ref)
 {
@@ -307,9 +292,9 @@ static void stream_release(struct urcu_ref *ref)
 		stream_fd_put(stream->stream_fd);
 		stream->stream_fd = NULL;
 	}
-	if (stream->index_fd) {
-		stream_fd_put(stream->index_fd);
-		stream->index_fd = NULL;
+	if (stream->index_file) {
+		lttng_index_file_put(stream->index_file);
+		stream->index_file = NULL;
 	}
 	if (stream->trace) {
 		ctf_trace_put(stream->trace);
@@ -322,15 +307,7 @@ static void stream_release(struct urcu_ref *ref)
 void stream_put(struct relay_stream *stream)
 {
 	DBG("stream put for stream id %" PRIu64, stream->stream_handle);
-	/*
-	 * Ensure existence of stream->reflock for stream unlock.
-	 */
 	rcu_read_lock();
-	/*
-	 * Stream reflock ensures that concurrent test and update of
-	 * stream ref is atomic.
-	 */
-	pthread_mutex_lock(&stream->reflock);
 	assert(stream->ref.refcount != 0);
 	/*
 	 * Wait until we have processed all the stream packets before
@@ -340,13 +317,20 @@ void stream_put(struct relay_stream *stream)
 			stream->stream_handle,
 			(int) stream->ref.refcount);
 	urcu_ref_put(&stream->ref, stream_release);
-	pthread_mutex_unlock(&stream->reflock);
 	rcu_read_unlock();
 }
 
 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
@@ -388,7 +372,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
@@ -447,6 +432,10 @@ void print_relay_streams(void)
 	struct lttng_ht_iter iter;
 	struct relay_stream *stream;
 
+	if (!relay_streams_ht) {
+		return;
+	}
+
 	rcu_read_lock();
 	cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
 			node.node) {