X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=35d1b8aa2d9b5aaa31d217f790ec1655fa1520c0;hb=d086f507d02078aed618ab291a0bc4a634958fa3;hp=6351ebe32f47431c0f6490bd6edd23ba3b8a0c37;hpb=2b29c638278807c1536634ce49f0c9c053b3ab5f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 6351ebe32..35d1b8aa2 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -561,7 +561,7 @@ struct consumer_output *consumer_copy_output(struct consumer_output *obj)
 	}
 	output->enabled = obj->enabled;
 	output->net_seq_index = obj->net_seq_index;
-	memcpy(output->subdir, obj->subdir, PATH_MAX);
+	memcpy(output->subdir, obj->subdir, sizeof(output->subdir));
 	output->snapshot = obj->snapshot;
 	output->relay_major_version = obj->relay_major_version;
 	output->relay_minor_version = obj->relay_minor_version;
@@ -1064,37 +1064,70 @@ error:
 	return ret;
 }
 
-int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
-		int pipe)
+static
+int consumer_send_pipe(struct consumer_socket *consumer_sock,
+		enum lttng_consumer_command cmd, int pipe)
 {
 	int ret;
 	struct lttcomm_consumer_msg msg;
+	const char *pipe_name;
+	const char *command_name;
+
+	switch (cmd) {
+	case LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE:
+		pipe_name = "channel monitor";
+		command_name = "SET_CHANNEL_MONITOR_PIPE";
+		break;
+	case LTTNG_CONSUMER_SET_CHANNEL_ROTATE_PIPE:
+		pipe_name = "channel rotate";
+		command_name = "SET_CHANNEL_ROTATE_PIPE";
+		break;
+	default:
+		ERR("Unexpected command received in %s (cmd = %d)", __func__,
+				(int) cmd);
+		abort();
+	}
 
 	/* Code flow error. Safety net. */
 
 	memset(&msg, 0, sizeof(msg));
-	msg.cmd_type = LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE;
+	msg.cmd_type = cmd;
 
 	pthread_mutex_lock(consumer_sock->lock);
-	DBG3("Sending set_channel_monitor_pipe command to consumer");
+	DBG3("Sending %s command to consumer", command_name);
 	ret = consumer_send_msg(consumer_sock, &msg);
 	if (ret < 0) {
 		goto error;
 	}
 
-	DBG3("Sending channel monitoring pipe %d to consumer on socket %d",
+	DBG3("Sending %s pipe %d to consumer on socket %d",
+			pipe_name,
 			pipe, *consumer_sock->fd_ptr);
 	ret = consumer_send_fds(consumer_sock, &pipe, 1);
 	if (ret < 0) {
 		goto error;
 	}
 
-	DBG2("Channel monitoring pipe successfully sent");
+	DBG2("%s pipe successfully sent", pipe_name);
 error:
 	pthread_mutex_unlock(consumer_sock->lock);
 	return ret;
 }
 
+int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
+		int pipe)
+{
+	return consumer_send_pipe(consumer_sock,
+			LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE, pipe);
+}
+
+int consumer_send_channel_rotate_pipe(struct consumer_socket *consumer_sock,
+		int pipe)
+{
+	return consumer_send_pipe(consumer_sock,
+			LTTNG_CONSUMER_SET_CHANNEL_ROTATE_PIPE, pipe);
+}
+
 /*
  * Set consumer subdirectory using the session name and a generated datetime if
  * needed. This is appended to the current subdirectory.
@@ -1579,3 +1612,104 @@ end:
 	rcu_read_unlock();
 	return ret;
 }
+
+int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
+		const struct consumer_output *output, const char *old_path,
+		const char *new_path, uid_t uid, gid_t gid)
+{
+	int ret;
+	struct lttcomm_consumer_msg msg;
+	size_t old_path_length, new_path_length;
+
+	assert(socket);
+	assert(old_path);
+	assert(new_path);
+
+	DBG("Consumer rotate rename session %" PRIu64 ", old path = \"%s\", new_path = \"%s\"",
+			session_id, old_path, new_path);
+
+	old_path_length = strlen(old_path);
+	if (old_path_length >= sizeof(msg.u.rotate_rename.old_path)) {
+		ERR("consumer_rotate_rename: old path length (%zu bytes) exceeds the maximal length allowed by the consumer protocol (%zu bytes)",
+				old_path_length + 1, sizeof(msg.u.rotate_rename.old_path));
+		ret = -1;
+		goto error;
+	}
+
+	new_path_length = strlen(new_path);
+	if (new_path_length >= sizeof(msg.u.rotate_rename.new_path)) {
+		ERR("consumer_rotate_rename: new path length (%zu bytes) exceeds the maximal length allowed by the consumer protocol (%zu bytes)",
+				new_path_length + 1, sizeof(msg.u.rotate_rename.new_path));
+		ret = -1;
+		goto error;
+	}
+
+	memset(&msg, 0, sizeof(msg));
+	msg.cmd_type = LTTNG_CONSUMER_ROTATE_RENAME;
+	msg.u.rotate_rename.session_id = session_id;
+	msg.u.rotate_rename.uid = uid;
+	msg.u.rotate_rename.gid = gid;
+	strcpy(msg.u.rotate_rename.old_path, old_path);
+	strcpy(msg.u.rotate_rename.new_path, new_path);
+
+	if (output->type == CONSUMER_DST_NET) {
+		msg.u.rotate_rename.relayd_id = output->net_seq_index;
+	} else {
+		msg.u.rotate_rename.relayd_id = -1ULL;
+	}
+
+	health_code_update();
+	ret = consumer_send_msg(socket, &msg);
+	if (ret < 0) {
+		goto error;
+	}
+
+error:
+	health_code_update();
+	return ret;
+}
+
+/*
+ * Ask the consumer to create a directory.
+ *
+ * Called with the consumer socket lock held.
+ */
+int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id,
+		const struct consumer_output *output, const char *path,
+		uid_t uid, gid_t gid)
+{
+	int ret;
+	struct lttcomm_consumer_msg msg;
+
+	assert(socket);
+
+	DBG("Consumer mkdir %s in session %" PRIu64, path, session_id);
+
+	memset(&msg, 0, sizeof(msg));
+	msg.cmd_type = LTTNG_CONSUMER_MKDIR;
+	msg.u.mkdir.session_id = session_id;
+	msg.u.mkdir.uid = uid;
+	msg.u.mkdir.gid = gid;
+	ret = snprintf(msg.u.mkdir.path, sizeof(msg.u.mkdir.path), "%s", path);
+	if (ret < 0 || ret >= sizeof(msg.u.mkdir.path)) {
+		ERR("Format path");
+		ret = -1;
+		goto error;
+	}
+
+	if (output->type == CONSUMER_DST_NET) {
+		msg.u.mkdir.relayd_id = output->net_seq_index;
+	} else {
+		msg.u.mkdir.relayd_id = -1ULL;
+	}
+
+	health_code_update();
+	ret = consumer_send_msg(socket, &msg);
+	if (ret < 0) {
+		goto error;
+	}
+
+error:
+	health_code_update();
+	return ret;
+}