X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=6d3ae1b5806fdb2c818cec136b826abdb7c24000;hp=5e644a72d9f821ec638d31e752542fa42cf2cffb;hb=c9a2957d9bca98ac11384b1e25c75a529ad1ee52;hpb=a503e1ef71bfe98526469205fc2956cc65954019

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 5e644a72d..6d3ae1b58 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -591,15 +591,9 @@ static void sessiond_cleanup(void)
 	 */
 	utils_close_pipe(thread_quit_pipe);
 
-	/*
-	 * If config.pid_file_path.value is undefined, the default file will be
-	 * wiped when removing the rundir.
-	 */
-	if (config.pid_file_path.value) {
-		ret = remove(config.pid_file_path.value);
-		if (ret < 0) {
-			PERROR("remove pidfile %s", config.pid_file_path.value);
-		}
+	ret = remove(config.pid_file_path.value);
+	if (ret < 0) {
+		PERROR("remove pidfile %s", config.pid_file_path.value);
 	}
 
 	DBG("Removing sessiond and consumerd content of directory %s",
@@ -3000,8 +2994,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_ROTATION_GET_INFO:
 	case LTTNG_SESSION_GET_CURRENT_OUTPUT:
 	case LTTNG_ROTATION_SET_SCHEDULE:
-	case LTTNG_ROTATION_SCHEDULE_GET_TIMER_PERIOD:
-	case LTTNG_ROTATION_SCHEDULE_GET_SIZE:
+	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 		need_domain = 0;
 		break;
 	default:
@@ -3046,8 +3039,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 	case LTTNG_DATA_PENDING:
 	case LTTNG_ROTATE_SESSION:
 	case LTTNG_ROTATION_GET_INFO:
-	case LTTNG_ROTATION_SCHEDULE_GET_TIMER_PERIOD:
-	case LTTNG_ROTATION_SCHEDULE_GET_SIZE:
+	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 		break;
 	default:
 		/* Setup lttng message with no payload */
@@ -4226,15 +4218,24 @@ error_add_context:
 	}
 	case LTTNG_ROTATION_SET_SCHEDULE:
 	{
+		bool set_schedule;
+		enum lttng_rotation_schedule_type schedule_type;
+		uint64_t value;
+
 		if (cmd_ctx->session->kernel_session && !check_rotate_compatible()) {
 			DBG("Kernel tracer version does not support session rotations");
 			ret = LTTNG_ERR_ROTATION_WRONG_VERSION;
 			goto error;
 		}
 
+		set_schedule = cmd_ctx->lsm->u.rotation_set_schedule.set == 1;
+		schedule_type = (enum lttng_rotation_schedule_type) cmd_ctx->lsm->u.rotation_set_schedule.type;
+		value = cmd_ctx->lsm->u.rotation_set_schedule.value;
+
 		ret = cmd_rotation_set_schedule(cmd_ctx->session,
-				cmd_ctx->lsm->u.rotate_setup.timer_us,
-				cmd_ctx->lsm->u.rotate_setup.size,
+				set_schedule,
+				schedule_type,
+				value,
 				notification_thread_handle);
 		if (ret != LTTNG_OK) {
 			goto error;
@@ -4242,42 +4243,17 @@ error_add_context:
 
 		break;
 	}
-	case LTTNG_ROTATION_SCHEDULE_GET_TIMER_PERIOD:
-	{
-		struct lttng_rotation_schedule_get_timer_period *get_timer;
-
-		get_timer = zmalloc(sizeof(struct lttng_rotation_schedule_get_timer_period));
-		if (!get_timer) {
-			ret = ENOMEM;
-			goto error;
-		}
-		get_timer->rotate_timer = cmd_ctx->session->rotate_timer_period;
-
-		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, get_timer,
-				sizeof(struct lttng_rotation_schedule_get_timer_period));
-		free(get_timer);
-		if (ret < 0) {
-			ret = -ret;
-			goto error;
-		}
-
-		ret = LTTNG_OK;
-		break;
-	}
-	case LTTNG_ROTATION_SCHEDULE_GET_SIZE:
+	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 	{
-		struct lttng_rotation_schedule_get_size *get_size;
-
-		get_size = zmalloc(sizeof(struct lttng_rotation_schedule_get_size));
-		if (!get_size) {
-			ret = ENOMEM;
-			goto error;
-		}
-		get_size->rotate_size = cmd_ctx->session->rotate_size;
-
-		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, get_size,
-				sizeof(struct lttng_rotation_schedule_get_size));
-		free(get_size);
+		struct lttng_session_list_schedules_return schedules = {
+			.periodic.set = !!cmd_ctx->session->rotate_timer_period,
+			.periodic.value = cmd_ctx->session->rotate_timer_period,
+			.size.set = !!cmd_ctx->session->rotate_size,
+			.size.value = cmd_ctx->session->rotate_size,
+		};
+
+		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, &schedules,
+				sizeof(schedules));
 		if (ret < 0) {
 			ret = -ret;
 			goto error;