X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-stream.c;h=f07e062f8d303a6b1aeeb0520a263009a05eae3d;hp=9d852b661ab420332308fb5d16a75fe093326dd0;hb=9edaf114d28249f4740de16bc9f58c43cfe8042e;hpb=8bb66c3cd60938352927ee865759433387324250

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 9d852b661..f07e062f8 100644
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
- *                      David Goulet <dgoulet@efficios.com>
- *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -44,14 +34,15 @@ static void viewer_stream_destroy_rcu(struct rcu_head *head)
 	viewer_stream_destroy(vstream);
 }
 
+/* Relay stream's lock must be held by the caller. */
 struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
-		struct lttng_trace_chunk *viewer_trace_chunk,
+		struct lttng_trace_chunk *trace_chunk,
 		enum lttng_viewer_seek seek_t)
 {
 	struct relay_viewer_stream *vstream = NULL;
-	const bool acquired_reference = lttng_trace_chunk_get(
-			viewer_trace_chunk);
+	const bool acquired_reference = lttng_trace_chunk_get(trace_chunk);
 
+	ASSERT_LOCKED(stream->lock);
 	if (!acquired_reference) {
 		goto error;
 	}
@@ -62,8 +53,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 		goto error;
 	}
 
-	vstream->stream_file.trace_chunk = viewer_trace_chunk;
-	viewer_trace_chunk = NULL;
+	vstream->stream_file.trace_chunk = trace_chunk;
+	trace_chunk = NULL;
 	vstream->path_name = lttng_strndup(stream->path_name, LTTNG_VIEWER_PATH_MAX);
 	if (vstream->path_name == NULL) {
 		PERROR("relay viewer path_name alloc");
@@ -82,8 +73,6 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 	}
 	vstream->stream = stream;
 
-	pthread_mutex_lock(&stream->lock);
-
 	if (stream->is_metadata && stream->trace->viewer_metadata_stream) {
 		ERR("Cannot attach viewer metadata stream to trace (busy).");
 		goto error_unlock;
@@ -193,7 +182,6 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 		rcu_assign_pointer(stream->trace->viewer_metadata_stream,
 				vstream);
 	}
-	pthread_mutex_unlock(&stream->lock);
 
 	/* Globally visible after the add unique. */
 	lttng_ht_node_init_u64(&vstream->stream_n, stream->stream_handle);
@@ -208,8 +196,8 @@ error:
 	if (vstream) {
 		viewer_stream_destroy(vstream);
 	}
-	if (viewer_trace_chunk && acquired_reference) {
-		lttng_trace_chunk_put(viewer_trace_chunk);
+	if (trace_chunk && acquired_reference) {
+		lttng_trace_chunk_put(trace_chunk);
 	}
 	return NULL;
 }