X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-session.c;h=a4b859726a6ea9b9bc7ef86ac5a019f43e29bdc2;hb=8d382dd4d4e95ea6ff88d6bd9f8a8fc85970ee3b;hp=657d3fc36a0892a4bbfa4268a58790539799dc9e;hpb=7591bab11eceedc6a0d1e02fd6f85592267a63b5;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/viewer-session.c b/src/bin/lttng-relayd/viewer-session.c
index 657d3fc36..a4b859726 100644
--- a/src/bin/lttng-relayd/viewer-session.c
+++ b/src/bin/lttng-relayd/viewer-session.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 <urcu/rculist.h>
@@ -106,6 +105,41 @@ void viewer_session_destroy(struct relay_viewer_session *vsession)
 	free(vsession);
 }
 
+/*
+ * Release ownership of all the streams of one session and detach the viewer.
+ */
+void viewer_session_close_one_session(struct relay_viewer_session *vsession,
+		struct relay_session *session)
+{
+	struct lttng_ht_iter iter;
+	struct relay_viewer_stream *vstream;
+
+	/*
+	 * TODO: improvement: create more efficient list of
+	 * vstream per session.
+	 */
+	cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter,
+			vstream, stream_n.node) {
+		if (!viewer_stream_get(vstream)) {
+			continue;
+		}
+		if (vstream->stream->trace->session != session) {
+			viewer_stream_put(vstream);
+			continue;
+		}
+		/* Put local reference. */
+		viewer_stream_put(vstream);
+		/*
+		 * We have reached one of the viewer stream's lifetime
+		 * end condition. This "put" will cause the proper
+		 * teardown of the viewer stream.
+		 */
+		viewer_stream_put(vstream);
+	}
+
+	viewer_session_detach(vsession, session);
+}
+
 void viewer_session_close(struct relay_viewer_session *vsession)
 {
 	struct relay_session *session;
@@ -113,32 +147,7 @@ void viewer_session_close(struct relay_viewer_session *vsession)
 	rcu_read_lock();
 	cds_list_for_each_entry_rcu(session,
 			&vsession->session_list, viewer_session_node) {
-		struct lttng_ht_iter iter;
-		struct relay_viewer_stream *vstream;
-
-		/*
-		 * TODO: improvement: create more efficient list of
-		 * vstream per session.
-		 */
-		cds_lfht_for_each_entry(viewer_streams_ht->ht, &iter.iter,
-				vstream, stream_n.node) {
-			if (!viewer_stream_get(vstream)) {
-				continue;
-			}
-			if (vstream->stream->trace->session != session) {
-				viewer_stream_put(vstream);
-				continue;
-			}
-			/* Put local reference. */
-			viewer_stream_put(vstream);
-			/*
-			 * We have reached one of the viewer stream's lifetime
-			 * end condition.
-			 */
-			viewer_stream_put(vstream);
-		}
-
-		viewer_session_detach(vsession, session);
+		viewer_session_close_one_session(vsession, session);
 	}
 	rcu_read_unlock();
 }