X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.h;h=883a265545e6965e2a82286cbcb6592d9781168c;hp=0750e1bcd83427cdd7cce518a2935d80759b0ab2;hb=a2b988e2cc31f76365b600ca4e3a26604de00022;hpb=bbc4768c20f1c552222e1746f9475d145d7bf04e

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 0750e1bcd..883a26554 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -36,6 +36,8 @@ struct ltt_ust_session;
 
 typedef void (*ltt_session_destroy_notifier)(const struct ltt_session *session,
 		void *user_data);
+typedef void (*ltt_session_clear_notifier)(const struct ltt_session *session,
+		void *user_data);
 
 /*
  * Tracing session list
@@ -75,7 +77,10 @@ struct ltt_session_list {
 struct ltt_session {
 	char name[NAME_MAX];
 	bool has_auto_generated_name;
+	bool name_contains_creation_time;
 	char hostname[HOST_NAME_MAX]; /* Local hostname. */
+	/* Path of the last closed chunk. */
+	char last_chunk_path[LTTNG_PATH_MAX];
 	time_t creation_time;
 	struct ltt_kernel_session *kernel_session;
 	struct ltt_ust_session *ust_session;
@@ -167,9 +172,20 @@ struct ltt_session {
 	 * Keep a state if this session was rotated after the last stop command.
 	 * We only allow one rotation after a stop. At destroy, we also need to
 	 * know if a rotation occurred since the last stop to rename the current
-	 * chunk.
+	 * chunk. After a stop followed by rotate, all subsequent clear
+	 * (without prior start) will succeed, but will be effect-less.
 	 */
 	bool rotated_after_last_stop;
+	/*
+	 * Track whether the session was cleared after last stop. All subsequent
+	 * clear (without prior start) will succeed, but will be effect-less. A
+	 * subsequent rotate (without prior start) will return an error.
+	 */
+	bool cleared_after_last_stop;
+	/*
+	 * True if the session has had an explicit non-quiet rotation.
+	 */
+	bool rotated;
 	/*
 	 * Condition and trigger for size-based rotations.
 	 */
@@ -180,9 +196,13 @@ struct ltt_session {
 	struct lttng_trace_chunk *chunk_being_archived;
 	/* Current state of a rotation. */
 	enum lttng_rotation_state rotation_state;
+	bool quiet_rotation;
 	char *last_archived_chunk_name;
 	LTTNG_OPTIONAL(uint64_t) last_archived_chunk_id;
 	struct lttng_dynamic_array destroy_notifiers;
+	struct lttng_dynamic_array clear_notifiers;
+	/* Session base path override. Set non-null. */
+	char *base_path;
 };
 
 /* Prototypes */
@@ -198,6 +218,10 @@ void session_destroy(struct ltt_session *session);
 int session_add_destroy_notifier(struct ltt_session *session,
 		ltt_session_destroy_notifier notifier, void *user_data);
 
+int session_add_clear_notifier(struct ltt_session *session,
+		ltt_session_clear_notifier notifier, void *user_data);
+void session_notify_clear(struct ltt_session *session);
+
 bool session_get(struct ltt_session *session);
 void session_put(struct ltt_session *session);
 
@@ -224,7 +248,8 @@ int session_reset_rotation_state(struct ltt_session *session,
 
 /* Create a new trace chunk object from the session's configuration. */
 struct lttng_trace_chunk *session_create_new_trace_chunk(
-		struct ltt_session *session,
+		const struct ltt_session *session,
+		const struct consumer_output *consumer_output_override,
 		const char *session_base_path_override,
 		const char *chunk_name_override);
 
@@ -244,8 +269,11 @@ int session_set_trace_chunk(struct ltt_session *session,
  * Close a chunk on the remote peers of a session. Has no effect on the
  * ltt_session itself.
  */
-int session_close_trace_chunk(const struct ltt_session *session,
+int session_close_trace_chunk(struct ltt_session *session,
 		struct lttng_trace_chunk *trace_chunk,
-		const enum lttng_trace_chunk_command_type *close_command);
+		enum lttng_trace_chunk_command_type close_command,
+		char *path);
+
+bool session_output_supports_trace_chunks(const struct ltt_session *session);
 
 #endif /* _LTT_SESSION_H */