X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=6b1bf69c424ab1bd18f67a342d4208594f3821fc;hb=b4bc01f7074ec9eb2a5784b72c804604e62bbe51;hp=3c6b5b8a01931540cbd050a9600f969e0076b471;hpb=275472aa987d92feeea39dd50bf605a43db4a703;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 3c6b5b8a0..6b1bf69c4 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"
 
@@ -780,7 +780,6 @@ end:
 
 static
 int save_agent_events(struct config_writer *writer,
-		struct ltt_ust_channel *chan,
 		struct agent *agent)
 {
 	int ret;
@@ -1254,7 +1253,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;
 		}
@@ -1673,7 +1672,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;
@@ -2033,7 +2032,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;
@@ -2047,7 +2047,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) {
@@ -2055,6 +2055,25 @@ int save_session(struct ltt_session *session,
 				goto end;
 			}
 		}
+		if (session->rotate_timer_period) {
+			ret = config_writer_write_element_unsigned_int(writer,
+					config_element_rotation_timer_interval,
+					session->rotate_timer_period);
+			if (ret) {
+				ret = LTTNG_ERR_SAVE_IO_FAIL;
+				goto end;
+			}
+		}
+
+		if (session->rotate_size) {
+			ret = config_writer_write_element_unsigned_int(writer,
+					config_element_rotation_size,
+					session->rotate_size);
+			if (ret) {
+				ret = LTTNG_ERR_SAVE_IO_FAIL;
+				goto end;
+			}
+		}
 
 		/* /attributes */
 		ret = config_writer_close_element(writer);