X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=5a70fe609204a1ad1e1b3bffdf091aee40cd90b4;hb=ce6176f27756b1b1453d4fef1c8f0978f02806ca;hp=b33287855e373ef0b9f253d02eb78294ccaab3e7;hpb=045fc61744f711fd2e4ca84c6339d97f1eafc71d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index b33287855..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"
 
@@ -104,6 +104,26 @@ int save_kernel_channel_attributes(struct config_writer *writer,
 	if (ret) {
 		goto end;
 	}
+
+	if (attr->extended.ptr) {
+		struct lttng_channel_extended *ext = NULL;
+
+		ext = (struct lttng_channel_extended *) attr->extended.ptr;
+		ret = config_writer_write_element_unsigned_int(writer,
+				config_element_monitor_timer_interval,
+				ext->monitor_timer_interval);
+		if (ret) {
+			goto end;
+		}
+
+		ret = config_writer_write_element_signed_int(writer,
+				config_element_blocking_timeout,
+				ext->blocking_timeout);
+		if (ret) {
+			goto end;
+		}
+	}
+
 end:
 	return ret ? LTTNG_ERR_SAVE_IO_FAIL : 0;
 }
@@ -113,6 +133,7 @@ int save_ust_channel_attributes(struct config_writer *writer,
 	struct lttng_ust_channel_attr *attr)
 {
 	int ret;
+	struct ltt_ust_channel *channel = NULL;
 
 	ret = config_writer_write_element_string(writer,
 		config_element_overwrite_mode,
@@ -156,6 +177,26 @@ int save_ust_channel_attributes(struct config_writer *writer,
 	if (ret) {
 		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
+	 */
+	channel = caa_container_of(attr, struct ltt_ust_channel, attr);
+	ret = config_writer_write_element_unsigned_int(writer,
+		config_element_monitor_timer_interval,
+		channel->monitor_timer_interval);
+	if (ret) {
+		goto end;
+	}
+
 end:
 	return ret ? LTTNG_ERR_SAVE_IO_FAIL : 0;
 }
@@ -232,6 +273,24 @@ const char *get_kernel_context_type_string(
 	case LTTNG_KERNEL_CONTEXT_HOSTNAME:
 		context_type_string = config_event_context_hostname;
 		break;
+	case LTTNG_KERNEL_CONTEXT_INTERRUPTIBLE:
+		context_type_string = config_event_context_interruptible;
+		break;
+	case LTTNG_KERNEL_CONTEXT_PREEMPTIBLE:
+		context_type_string = config_event_context_preemptible;
+		break;
+	case LTTNG_KERNEL_CONTEXT_NEED_RESCHEDULE:
+		context_type_string = config_event_context_need_reschedule;
+		break;
+	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;
 	}
@@ -502,57 +561,6 @@ end:
 	return ret;
 }
 
-static
-int save_kernel_syscall(struct config_writer *writer,
-		struct ltt_kernel_channel *kchan)
-{
-	int ret, i;
-	ssize_t count;
-	struct lttng_event *events = NULL;
-
-	assert(writer);
-	assert(kchan);
-
-	count = syscall_list_channel(kchan, &events, 0);
-	if (!count) {
-		/* No syscalls, just gracefully return. */
-		ret = 0;
-		goto end;
-	}
-
-	for (i = 0; i < count; i++) {
-		struct ltt_kernel_event *kevent;
-
-		/* Create a temporary kevent in order to save it. */
-		/*
-		 * TODO: struct lttng_event does not really work for a filter,
-		 * but unfortunately, it is exposed as external API (and used as
-		 * internal representation. Using NULL meanwhile.
-		 */
-		kevent = trace_kernel_create_event(&events[i],
-			NULL, NULL);
-		if (!kevent) {
-			ret = -ENOMEM;
-			goto end;
-		}
-		/* Init list in order so the destroy call can del the node. */
-		CDS_INIT_LIST_HEAD(&kevent->list);
-
-		ret = save_kernel_event(writer, kevent);
-		trace_kernel_destroy_event(kevent);
-		if (ret) {
-			goto end;
-		}
-	}
-
-	/* Everything went well */
-	ret = 0;
-
-end:
-	free(events);
-	return ret;
-}
-
 static
 int save_kernel_events(struct config_writer *writer,
 	struct ltt_kernel_channel *kchan)
@@ -573,12 +581,6 @@ int save_kernel_events(struct config_writer *writer,
 		}
 	}
 
-	/* Save syscalls if any. */
-	ret = save_kernel_syscall(writer, kchan);
-	if (ret) {
-		goto end;
-	}
-
 	/* /events */
 	ret = config_writer_close_element(writer);
 	if (ret) {
@@ -753,7 +755,11 @@ int init_ust_event_from_agent_event(struct ltt_ust_event *ust_event,
 
 	ust_event->enabled = agent_event->enabled;
 	ust_event->attr.instrumentation = LTTNG_UST_TRACEPOINT;
-	strncpy(ust_event->attr.name, agent_event->name, LTTNG_SYMBOL_NAME_LEN);
+	if (lttng_strncpy(ust_event->attr.name, agent_event->name,
+			LTTNG_SYMBOL_NAME_LEN)) {
+		ret = -1;
+		goto end;
+	}
 	switch (agent_event->loglevel_type) {
 	case LTTNG_EVENT_LOGLEVEL_ALL:
 		ust_loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
@@ -780,7 +786,6 @@ end:
 
 static
 int save_agent_events(struct config_writer *writer,
-		struct ltt_ust_channel *chan,
 		struct agent *agent)
 {
 	int ret;
@@ -1254,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;
 		}
@@ -1673,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;
@@ -1881,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.
  *
@@ -2033,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;
@@ -2047,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) {
@@ -2055,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);
@@ -2094,6 +2185,13 @@ end:
 		}
 	}
 
+	if (file_opened) {
+		ret = close(fd);
+		if (ret) {
+			PERROR("Closing XML session configuration");
+		}
+	}
+
 	return ret;
 }