X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=5a70fe609204a1ad1e1b3bffdf091aee40cd90b4;hb=51eab943fe37b0fdd541099c4d02ea7b57cb15bb;hp=b9bcc666d797cf0bb97fc0ec88c5eff2e508a141;hpb=4fc2b12601cd1bd62a6bbdb75f08f1d32cdb781f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index b9bcc666d..5a70fe609 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -32,7 +32,7 @@
 #include "kernel.h"
 #include "save.h"
 #include "session.h"
-#include "syscall.h"
+#include "lttng-syscall.h"
 #include "trace-ust.h"
 #include "agent.h"
 
@@ -115,6 +115,13 @@ int save_kernel_channel_attributes(struct config_writer *writer,
 		if (ret) {
 			goto end;
 		}
+
+		ret = config_writer_write_element_signed_int(writer,
+				config_element_blocking_timeout,
+				ext->blocking_timeout);
+		if (ret) {
+			goto end;
+		}
 	}
 
 end:
@@ -171,6 +178,13 @@ int save_ust_channel_attributes(struct config_writer *writer,
 		goto end;
 	}
 
+	ret = config_writer_write_element_signed_int(writer,
+			config_element_blocking_timeout,
+			attr->u.s.blocking_timeout);
+	if (ret) {
+		goto end;
+	}
+
 	/*
 	 * Fetch the monitor timer which is located in the parent of
 	 * lttng_ust_channel_attr
@@ -271,6 +285,12 @@ const char *get_kernel_context_type_string(
 	case LTTNG_KERNEL_CONTEXT_MIGRATABLE:
 		context_type_string = config_event_context_migratable;
 		break;
+	case LTTNG_KERNEL_CONTEXT_CALLSTACK_USER:
+		context_type_string = config_event_context_callstack_user;
+		break;
+	case LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL:
+		context_type_string = config_event_context_callstack_kernel;
+		break;
 	default:
 		context_type_string = NULL;
 	}
@@ -766,7 +786,6 @@ end:
 
 static
 int save_agent_events(struct config_writer *writer,
-		struct ltt_ust_channel *chan,
 		struct agent *agent)
 {
 	int ret;
@@ -1240,7 +1259,7 @@ int save_ust_channel(struct config_writer *writer,
 		 * the "agent" events associated with this channel and serialize
 		 * them.
 		 */
-		ret = save_agent_events(writer, ust_chan, agent);
+		ret = save_agent_events(writer, agent);
 		if (ret) {
 			goto end;
 		}
@@ -1659,7 +1678,7 @@ int save_consumer_output(struct config_writer *writer,
 	switch (output->type) {
 	case CONSUMER_DST_LOCAL:
 		ret = config_writer_write_element_string(writer,
-			config_element_path, output->dst.trace_path);
+			config_element_path, output->dst.session_root_path);
 		if (ret) {
 			ret = LTTNG_ERR_SAVE_IO_FAIL;
 			goto end;
@@ -1867,6 +1886,83 @@ end:
 	return ret;
 }
 
+static
+int save_session_rotation_schedule(struct config_writer *writer,
+		enum lttng_rotation_schedule_type type, uint64_t value)
+{
+	int ret = 0;
+	const char *element_name;
+	const char *value_name;
+
+	switch (type) {
+	case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC:
+		element_name = config_element_rotation_schedule_periodic;
+	        value_name = config_element_rotation_schedule_periodic_time_us;
+		break;
+	case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD:
+		element_name = config_element_rotation_schedule_size_threshold;
+	        value_name = config_element_rotation_schedule_size_threshold_bytes;
+		break;
+	default:
+		ret = -1;
+		goto end;
+	}
+
+	ret = config_writer_open_element(writer, element_name);
+	if (ret) {
+		goto end;
+	}
+
+	ret = config_writer_write_element_unsigned_int(writer,
+			value_name, value);
+	if (ret) {
+		goto end;
+	}
+
+	/* Close schedule descriptor element. */
+	ret = config_writer_close_element(writer);
+	if (ret) {
+		goto end;
+	}
+end:
+	return ret;
+}
+
+static
+int save_session_rotation_schedules(struct config_writer *writer,
+	struct ltt_session *session)
+{
+	int ret;
+
+	ret = config_writer_open_element(writer,
+			config_element_rotation_schedules);
+	if (session->rotate_timer_period) {
+		ret = save_session_rotation_schedule(writer,
+				LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC,
+				session->rotate_timer_period);
+		if (ret) {
+			goto close_schedules;
+		}
+	}
+	if (session->rotate_size) {
+		ret = save_session_rotation_schedule(writer,
+				LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD,
+				session->rotate_size);
+		if (ret) {
+			goto close_schedules;
+		}
+	}
+
+close_schedules:
+	/* Close rotation schedules element. */
+	ret = config_writer_close_element(writer);
+	if (ret) {
+		goto end;
+	}
+end:
+	return ret;
+}
+
 /*
  * Save the given session.
  *
@@ -2019,7 +2115,8 @@ int save_session(struct ltt_session *session,
 		goto end;
 	}
 
-	if (session->snapshot_mode || session->live_timer) {
+	if (session->snapshot_mode || session->live_timer ||
+			session->rotate_timer_period || session->rotate_size) {
 		ret = config_writer_open_element(writer, config_element_attributes);
 		if (ret) {
 			ret = LTTNG_ERR_SAVE_IO_FAIL;
@@ -2033,7 +2130,7 @@ int save_session(struct ltt_session *session,
 				ret = LTTNG_ERR_SAVE_IO_FAIL;
 				goto end;
 			}
-		} else {
+		} else if (session->live_timer) {
 			ret = config_writer_write_element_unsigned_int(writer,
 					config_element_live_timer_interval, session->live_timer);
 			if (ret) {
@@ -2041,6 +2138,14 @@ int save_session(struct ltt_session *session,
 				goto end;
 			}
 		}
+		if (session->rotate_timer_period || session->rotate_size) {
+			ret = save_session_rotation_schedules(writer,
+					session);
+			if (ret) {
+				ret = LTTNG_ERR_SAVE_IO_FAIL;
+				goto end;
+			}
+		}
 
 		/* /attributes */
 		ret = config_writer_close_element(writer);