X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Frotate.c;h=bdce8d8574a82f5bb1872a332d7023a79c47bac8;hp=9ad32f962c035a90429bef225edc75919aa73b41;hb=dd73d57bb95fae31161ca0781108d166082a06f5;hpb=329f344308786acb81d8939eb8e1ad37307696c2

diff --git a/src/lib/lttng-ctl/rotate.c b/src/lib/lttng-ctl/rotate.c
index 9ad32f962..bdce8d857 100644
--- a/src/lib/lttng-ctl/rotate.c
+++ b/src/lib/lttng-ctl/rotate.c
@@ -21,6 +21,7 @@
 
 #include <lttng/lttng-error.h>
 #include <lttng/rotation.h>
+#include <lttng/location-internal.h>
 #include <lttng/rotate-internal.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/macros.h>
@@ -149,13 +150,45 @@ end:
 	return status;
 }
 
+void lttng_rotation_schedule_attr_set_size(
+		struct lttng_rotation_schedule_attr *attr, uint64_t size)
+{
+	attr->size = size;
+}
+
+static
+struct lttng_trace_archive_location *
+create_trace_archive_location_from_get_info(
+		const struct lttng_rotation_get_info_return *info)
+{
+	struct lttng_trace_archive_location *location;
+
+	switch (info->location_type) {
+	case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL:
+		location = lttng_trace_archive_location_local_create(
+				info->location.local.absolute_path);
+		break;
+	case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY:
+		location = lttng_trace_archive_location_relay_create(
+				info->location.relay.host,
+				info->location.relay.protocol,
+				info->location.relay.ports.control,
+				info->location.relay.ports.data,
+				info->location.relay.relative_path);
+		break;
+	default:
+		location = NULL;
+		break;
+	}
+	return location;
+}
+
 enum lttng_rotation_status lttng_rotation_handle_get_state(
 		struct lttng_rotation_handle *rotation_handle,
 		enum lttng_rotation_state *state)
 {
 	enum lttng_rotation_status status = LTTNG_ROTATION_STATUS_OK;
 	struct lttng_rotation_get_info_return *info = NULL;
-	int ret;
 
 	if (!rotation_handle || !state) {
 		status = LTTNG_ROTATION_STATUS_INVALID;
@@ -168,7 +201,7 @@ enum lttng_rotation_status lttng_rotation_handle_get_state(
 	}
 
 	*state = (enum lttng_rotation_state) info->status;
-	if (rotation_handle->archive_location.is_set ||
+	if (rotation_handle->archive_location ||
 			*state != LTTNG_ROTATION_STATE_COMPLETED) {
 		/*
 		 * The path is only provided by the sessiond once
@@ -181,35 +214,32 @@ enum lttng_rotation_status lttng_rotation_handle_get_state(
 	 * Cache the location since the rotation may expire before the user
 	 * has a chance to query it.
 	 */
-	ret = lttng_strncpy(rotation_handle->archive_location.path,
-			info->path,
-			sizeof(rotation_handle->archive_location.path));
-	if (ret) {
+	rotation_handle->archive_location =
+			create_trace_archive_location_from_get_info(info);
+	if (!rotation_handle->archive_location) {
 		status = LTTNG_ROTATION_STATUS_ERROR;
 		goto end;
 	}
-	rotation_handle->archive_location.is_set = true;
 end:
 	free(info);
 	return status;
 }
 
-enum lttng_rotation_status lttng_rotation_handle_get_completed_archive_location(
+enum lttng_rotation_status lttng_rotation_handle_get_archive_location(
 		struct lttng_rotation_handle *rotation_handle,
-		const char **path)
+		const struct lttng_trace_archive_location **location)
 {
-	int ret;
 	enum lttng_rotation_status status = LTTNG_ROTATION_STATUS_OK;
 	struct lttng_rotation_get_info_return *info = NULL;
 
-	if (!rotation_handle || !path) {
+	if (!rotation_handle || !location) {
 		status = LTTNG_ROTATION_STATUS_INVALID;
 		goto end;
 	}
 
 	/* Use the cached location we got from a previous query. */
-	if (rotation_handle->archive_location.is_set) {
-		*path = rotation_handle->archive_location.path;
+	if (rotation_handle->archive_location) {
+		*location = rotation_handle->archive_location;
 		goto end;
 	}
 
@@ -224,14 +254,12 @@ enum lttng_rotation_status lttng_rotation_handle_get_completed_archive_location(
 		goto end;
 	}
 
-	ret = lttng_strncpy(rotation_handle->archive_location.path,
-			info->path,
-			sizeof(rotation_handle->archive_location.path));
-	if (ret) {
+	rotation_handle->archive_location =
+			create_trace_archive_location_from_get_info(info);
+	if (!rotation_handle->archive_location) {
 		status = LTTNG_ROTATION_STATUS_ERROR;
 		goto end;
 	}
-	rotation_handle->archive_location.is_set = true;
 end:
 	free(info);
 	return status;
@@ -240,6 +268,7 @@ end:
 void lttng_rotation_handle_destroy(
 		struct lttng_rotation_handle *rotation_handle)
 {
+	lttng_trace_archive_location_destroy(rotation_handle->archive_location);
 	free(rotation_handle);
 }
 
@@ -323,9 +352,9 @@ int lttng_rotation_set_schedule(
 	lttng_ctl_copy_string(lsm.session.name, attr->session_name,
 			sizeof(lsm.session.name));
 	lsm.u.rotate_setup.timer_us = attr->timer_us;
+	lsm.u.rotate_setup.size = attr->size;
 
 	ret = lttng_ctl_ask_sessiond(&lsm, NULL);
-
 end:
 	return ret;
 }
@@ -349,9 +378,7 @@ int lttng_rotation_schedule_get_timer_period(const char *session_name,
 	}
 
 	*rotate_timer = get_timer->rotate_timer;
-
 	ret = 0;
-
 end:
 	free(get_timer);
 	return ret;