X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=2300e5f1adab5c6c2190af4829cb9c2767f3e2f3;hb=49e614cb2878f0664c9f44f9f24cb1d81116de21;hp=33d7d43c0f67b5814c02c5fabe1db15c69e4c059;hpb=7591bab11eceedc6a0d1e02fd6f85592267a63b5;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 33d7d43c0..2300e5f1a 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -131,7 +131,14 @@ static void rcu_destroy_session(struct rcu_head *rcu_head)
 	struct relay_session *session =
 			caa_container_of(rcu_head, struct relay_session,
 				rcu_node);
-
+	/*
+	 * Since each trace has a reference on the session, it means
+	 * that if we are at the point where we teardown the session, no
+	 * trace belonging to that session exist at this point.
+	 * Calling lttng_ht_destroy in call_rcu worker thread so we
+	 * don't hold the RCU read-side lock while calling it.
+	 */
+	lttng_ht_destroy(session->ctf_traces_ht);
 	free(session);
 }
 
@@ -155,12 +162,6 @@ static void destroy_session(struct relay_session *session)
 
 	ret = session_delete(session);
 	assert(!ret);
-	/*
-	 * Since each trace has a reference on the session, it means
-	 * that if we are at the point where we teardown the session, no
-	 * trace belonging to that session exist at this point.
-	 */
-	lttng_ht_destroy(session->ctf_traces_ht);
 	call_rcu(&session->rcu_node, rcu_destroy_session);
 }
 
@@ -212,7 +213,8 @@ unlock:
 	}
 	cds_list_for_each_entry_rcu(stream, &session->recv_list,
 			recv_node) {
-		stream_close(stream);
+		/* Close streams which have not been published yet. */
+		try_stream_close(stream);
 	}
 rcu_unlock:
 	rcu_read_unlock();