X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.cpp;h=b30e9aac0680eb6795a763f836a5da8ff18349fa;hb=d119bd017a99d56ad36901ce8f2175a8ea3b5e5e;hp=bb0ec0a2436db1a9fb042b29b1e53b622c2eb60e;hpb=a4beac76c09632fda439fac25fdb0f7191234191;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-stream.cpp b/src/common/consumer/consumer-stream.cpp
index bb0ec0a24..b30e9aac0 100644
--- a/src/common/consumer/consumer-stream.cpp
+++ b/src/common/consumer/consumer-stream.cpp
@@ -850,69 +850,19 @@ void consumer_stream_relayd_close(struct lttng_consumer_stream *stream,
  * The consumer data lock MUST be acquired.
  * The stream lock MUST be acquired.
  */
-void consumer_stream_close(struct lttng_consumer_stream *stream)
+void consumer_stream_close_output(struct lttng_consumer_stream *stream)
 {
-	int ret;
 	struct consumer_relayd_sock_pair *relayd;
 
 	LTTNG_ASSERT(stream);
 
-	switch (the_consumer_data.type) {
-	case LTTNG_CONSUMER_KERNEL:
-		if (stream->mmap_base != NULL) {
-			ret = munmap(stream->mmap_base, stream->mmap_len);
-			if (ret != 0) {
-				PERROR("munmap");
-			}
-		}
-
-		if (stream->wait_fd >= 0) {
-			ret = close(stream->wait_fd);
-			if (ret) {
-				PERROR("close");
-			}
-			stream->wait_fd = -1;
-		}
-		if (stream->chan->output == CONSUMER_CHANNEL_SPLICE) {
-			utils_close_pipe(stream->splice_pipe);
-		}
-		break;
-	case LTTNG_CONSUMER32_UST:
-	case LTTNG_CONSUMER64_UST:
-	{
-		/*
-		 * Special case for the metadata since the wait fd is an internal pipe
-		 * polled in the metadata thread.
-		 */
-		if (stream->metadata_flag && stream->chan->monitor) {
-			int rpipe = stream->ust_metadata_poll_pipe[0];
-
-			/*
-			 * This will stop the channel timer if one and close the write side
-			 * of the metadata poll pipe.
-			 */
-			lttng_ustconsumer_close_metadata(stream->chan);
-			if (rpipe >= 0) {
-				ret = close(rpipe);
-				if (ret < 0) {
-					PERROR("closing metadata pipe read side");
-				}
-				stream->ust_metadata_poll_pipe[0] = -1;
-			}
-		}
-		break;
-	}
-	default:
-		ERR("Unknown consumer_data type");
-		abort();
-	}
-
 	/* Close output fd. Could be a socket or local file at this point. */
 	if (stream->out_fd >= 0) {
-		ret = close(stream->out_fd);
+		const auto ret = close(stream->out_fd);
 		if (ret) {
-			PERROR("close");
+			PERROR("Failed to close stream output file descriptor");
 		}
+
 		stream->out_fd = -1;
 	}
 
@@ -929,7 +879,9 @@ void consumer_stream_close(struct lttng_consumer_stream *stream)
 	relayd = consumer_find_relayd(stream->net_seq_idx);
 	if (relayd != NULL) {
 		consumer_stream_relayd_close(stream, relayd);
+		stream->net_seq_idx = -1ULL;
 	}
+
 	rcu_read_unlock();
 }
 
@@ -1001,9 +953,54 @@ void consumer_stream_destroy_buffers(struct lttng_consumer_stream *stream)
 
 	switch (the_consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
+		if (stream->mmap_base != NULL) {
+			const auto ret = munmap(stream->mmap_base, stream->mmap_len);
+
+			if (ret != 0) {
+				PERROR("munmap");
+			}
+		}
+
+		if (stream->wait_fd >= 0) {
+			const auto ret = close(stream->wait_fd);
+
+			if (ret) {
+				PERROR("close");
+			}
+
+			stream->wait_fd = -1;
+		}
+
+		if (stream->chan->output == CONSUMER_CHANNEL_SPLICE) {
+			utils_close_pipe(stream->splice_pipe);
+		}
+
 		break;
 	case LTTNG_CONSUMER32_UST:
 	case LTTNG_CONSUMER64_UST:
+		/*
+		 * Special case for the metadata since the wait fd is an internal pipe
+		 * polled in the metadata thread.
+		 */
+		if (stream->metadata_flag && stream->chan->monitor) {
+			const auto rpipe = stream->ust_metadata_poll_pipe[0];
+
+			/*
+			 * This will stop the channel timer if one and close the write side
+			 * of the metadata poll pipe.
+			 */
+			lttng_ustconsumer_close_metadata(stream->chan);
+			if (rpipe >= 0) {
+				const auto ret = close(rpipe);
+
+				if (ret < 0) {
+					PERROR("closing metadata pipe read side");
+				}
+
+				stream->ust_metadata_poll_pipe[0] = -1;
+			}
+		}
+
 		lttng_ustconsumer_del_stream(stream);
 		break;
 	default:
@@ -1024,7 +1021,7 @@ static void destroy_close_stream(struct lttng_consumer_stream *stream)
 	/* Destroy tracer buffers of the stream. */
 	consumer_stream_destroy_buffers(stream);
 	/* Close down everything including the relayd if one. */
-	consumer_stream_close(stream);
+	consumer_stream_close_output(stream);
 }
 
 /*