X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=820427aa99ed168d24f30cb28856fa87a6a4f950;hb=00fb02ace5151a6546f4e97e5439512913a50e68;hp=2d66048087727d6ae8fe063aeb871a36dbea8536;hpb=446156b4cba25f3d9abc835dd0d531a447d52941;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 2d6604808..820427aa9 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -3783,3 +3783,108 @@ unsigned long consumer_get_consume_start_pos(unsigned long consumed_pos,
 	}
 	return start_pos;
 }
+
+static
+int rotate_rename_local(const char *old_path, const char *new_path,
+		uid_t uid, gid_t gid)
+{
+	int ret;
+
+	assert(old_path);
+	assert(new_path);
+
+	ret = utils_mkdir_recursive(new_path, S_IRWXU | S_IRWXG, uid, gid);
+	if (ret < 0) {
+		ERR("Create directory on rotate");
+		goto end;
+	}
+
+	ret = rename(old_path, new_path);
+	if (ret < 0 && errno != ENOENT) {
+		PERROR("Rename completed rotation chunk");
+		goto end;
+	}
+
+	ret = 0;
+end:
+	return ret;
+}
+
+static
+int rotate_rename_relay(const char *old_path, const char *new_path,
+		uint64_t relayd_id)
+{
+	int ret;
+	struct consumer_relayd_sock_pair *relayd;
+
+	relayd = consumer_find_relayd(relayd_id);
+	if (!relayd) {
+		ERR("Failed to find relayd while running rotate_rename_relay command");
+		ret = -1;
+		goto end;
+	}
+
+	pthread_mutex_lock(&relayd->ctrl_sock_mutex);
+	ret = relayd_rotate_rename(&relayd->control_sock, old_path, new_path);
+	pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
+end:
+	return ret;
+}
+
+int lttng_consumer_rotate_rename(const char *old_path, const char *new_path,
+		uid_t uid, gid_t gid, uint64_t relayd_id)
+{
+	if (relayd_id != -1ULL) {
+		return rotate_rename_relay(old_path, new_path, relayd_id);
+	} else {
+		return rotate_rename_local(old_path, new_path, uid, gid);
+	}
+}
+
+static
+int mkdir_local(const char *path, uid_t uid, gid_t gid)
+{
+	int ret;
+
+	ret = utils_mkdir_recursive(path, S_IRWXU | S_IRWXG, uid, gid);
+	if (ret < 0) {
+		/* utils_mkdir_recursive logs an error. */
+		goto end;
+	}
+
+	ret = 0;
+end:
+	return ret;
+}
+
+static
+int mkdir_relay(const char *path, uint64_t relayd_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_mkdir(&relayd->control_sock, path);
+	pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
+
+end:
+	return ret;
+
+}
+
+int lttng_consumer_mkdir(const char *path, uid_t uid, gid_t gid,
+		uint64_t relayd_id)
+{
+	if (relayd_id != -1ULL) {
+		return mkdir_relay(path, relayd_id);
+	} else {
+		return mkdir_local(path, uid, gid);
+	}
+}