X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=5fa0ec4faa8a76cbb2950d18d4d576e2f4852dc2;hp=3ac00cb030bdebc60a3c864a91107873fb683f63;hb=239f61af8ea0b97cec0543220a9bfa1184c7ede2;hpb=b99a8d4211e26a847ca8916884354f159c999ad2

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 3ac00cb03..5fa0ec4fa 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1475,7 +1475,7 @@ void lttng_consumer_destroy(struct lttng_consumer_local_data *ctx)
  */
 static int write_relayd_metadata_id(int fd,
 		struct lttng_consumer_stream *stream,
-		struct consumer_relayd_sock_pair *relayd, unsigned long padding)
+		unsigned long padding)
 {
 	ssize_t ret;
 	struct lttcomm_relayd_metadata_payload hdr;
@@ -1610,7 +1610,7 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 
 		/* Write metadata stream id before payload */
 		if (stream->metadata_flag) {
-			ret = write_relayd_metadata_id(outfd, stream, relayd, padding);
+			ret = write_relayd_metadata_id(outfd, stream, padding);
 			if (ret < 0) {
 				relayd_hang_up = 1;
 				goto write_error;
@@ -1799,7 +1799,7 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 				}
 				stream->reset_metadata_flag = 0;
 			}
-			ret = write_relayd_metadata_id(splice_pipe[1], stream, relayd,
+			ret = write_relayd_metadata_id(splice_pipe[1], stream,
 					padding);
 			if (ret < 0) {
 				written = ret;
@@ -4389,6 +4389,27 @@ int lttng_consumer_rotate_rename(const char *old_path, const char *new_path,
 	}
 }
 
+int lttng_consumer_rotate_pending_relay(uint64_t session_id,
+		uint64_t relayd_id, uint64_t chunk_id)
+{
+	int ret;
+	struct consumer_relayd_sock_pair *relayd;
+
+	relayd = consumer_find_relayd(relayd_id);
+	if (!relayd) {
+		ERR("Failed to find relayd");
+		ret = -1;
+		goto end;
+	}
+
+	pthread_mutex_lock(&relayd->ctrl_sock_mutex);
+	ret = relayd_rotate_pending(&relayd->control_sock, chunk_id);
+	pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
+
+end:
+	return ret;
+}
+
 static
 int mkdir_local(const char *path, uid_t uid, gid_t gid)
 {