X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_rotation.c;h=e917cbdc172beb785f172f9bcb0c09e7d4cdff8f;hp=b0de06d9f99ec5399da5498da34d9009c86fd9df;hb=90936dcf0968343f20b2f6fd365b9c015cdb9717;hpb=1d757b1cd3b4669b52e2d9ceafb03eafd42490ff

diff --git a/src/bin/lttng/commands/disable_rotation.c b/src/bin/lttng/commands/disable_rotation.c
index b0de06d9f..e917cbdc1 100644
--- a/src/bin/lttng/commands/disable_rotation.c
+++ b/src/bin/lttng/commands/disable_rotation.c
@@ -39,6 +39,7 @@ enum {
 	OPT_HELP = 1,
 	OPT_LIST_OPTIONS,
 	OPT_TIMER,
+	OPT_SIZE,
 };
 
 static struct poptOption long_options[] = {
@@ -47,10 +48,11 @@ static struct poptOption long_options[] = {
 	{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
 	{"session",     's', POPT_ARG_STRING, &opt_session_name, 0, 0, 0},
 	{"timer",        0,   POPT_ARG_NONE, 0, OPT_TIMER, 0, 0},
+	{"size",         0,   POPT_ARG_NONE, 0, OPT_SIZE, 0, 0},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
-static int setup_rotate(char *session_name, uint64_t timer)
+static int setup_rotate(char *session_name, uint64_t timer, uint64_t size)
 {
 	int ret = 0;
 	struct lttng_rotation_schedule_attr *attr = NULL;
@@ -86,6 +88,10 @@ static int setup_rotate(char *session_name, uint64_t timer)
 		lttng_rotation_schedule_attr_set_timer_period(attr, timer);
 		MSG("Disabling rotation timer on session %s", session_name);
 	}
+	if (size == -1ULL) {
+		lttng_rotation_schedule_attr_set_size(attr, size);
+		MSG("Disabling rotation based on size on session %s", session_name);
+	}
 
 	ret = lttng_rotation_set_schedule(attr);
 	if (ret) {
@@ -140,7 +146,7 @@ int cmd_disable_rotation(int argc, const char **argv)
 	static poptContext pc;
 	char *session_name = NULL;
 	bool free_session_name = false;
-	uint64_t timer = 0;
+	uint64_t timer = 0, size = 0;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 0);
 	popt_ret = poptReadDefaultConfig(pc, 0);
@@ -161,6 +167,9 @@ int cmd_disable_rotation(int argc, const char **argv)
 		case OPT_TIMER:
 			timer = -1ULL;
 			break;
+		case OPT_SIZE:
+			size = -1ULL;
+			break;
 		default:
 			ret = CMD_UNDEFINED;
 			goto end;
@@ -203,12 +212,12 @@ int cmd_disable_rotation(int argc, const char **argv)
 	}
 
 	/* No config options, just rotate the session now */
-	if (timer == 0) {
-		ERR("No timer given");
+	if (timer == 0 && size == 0) {
+		ERR("Missing timer period (--timer) or size limit (--size) option");
 		success = 0;
 		command_ret = -1;
 	} else {
-		command_ret = setup_rotate(session_name, timer);
+		command_ret = setup_rotate(session_name, timer, size);
 	}
 
 	if (command_ret) {