From dc3bfa8d4cbb95c7420673b677ef1b2447673642 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 19 Sep 2019 13:47:08 -0400 Subject: [PATCH] relayd: move viewer stream chunk reference release to destroy MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Move the viewer stream's release of its trace chunk to the destroy method (as opposed to the release method) as destroy is used directly when an error occurs in the viewer stream's creation function. Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/viewer-stream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c index 21294d1f3..70cd1cea1 100644 --- a/src/bin/lttng-relayd/viewer-stream.c +++ b/src/bin/lttng-relayd/viewer-stream.c @@ -27,6 +27,7 @@ static void viewer_stream_destroy(struct relay_viewer_stream *vstream) { + lttng_trace_chunk_put(vstream->stream_file.trace_chunk); free(vstream->path_name); free(vstream->channel_name); free(vstream); @@ -205,7 +206,7 @@ static void viewer_stream_release(struct urcu_ref *ref) stream_put(vstream->stream); vstream->stream = NULL; } - lttng_trace_chunk_put(vstream->stream_file.trace_chunk); + call_rcu(&vstream->rcu_node, viewer_stream_destroy_rcu); } -- 2.34.1