X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.h;h=204701429ded69ba43c77b8917306bc347330172;hb=46ef21888c975515837d5dab104c938c424792ed;hp=1cea52a61fc64a75169041aa7bbddee7b8180082;hpb=d295668767ac8234e83984e1812d342d03293d88;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.h b/src/bin/lttng-sessiond/session.h
index 1cea52a61..204701429 100644
--- a/src/bin/lttng-sessiond/session.h
+++ b/src/bin/lttng-sessiond/session.h
@@ -23,6 +23,7 @@
 #include <urcu/list.h>
 
 #include <common/hashtable/hashtable.h>
+#include <common/dynamic-array.h>
 #include <lttng/rotation.h>
 #include <lttng/location.h>
 #include <lttng/lttng-error.h>
@@ -33,6 +34,9 @@
 
 struct ltt_ust_session;
 
+typedef void (*ltt_session_destroy_notifier)(const struct ltt_session *session,
+		void *user_data);
+
 /*
  * Tracing session list
  *
@@ -71,6 +75,7 @@ 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. */
 	time_t creation_time;
 	struct ltt_kernel_session *kernel_session;
@@ -176,13 +181,17 @@ 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;
+	/* Session base path override. Set non-null. */
+	char *base_path;
 };
 
 /* Prototypes */
 enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
-		struct ltt_session **out_session);
+		const char *base_path, struct ltt_session **out_session);
 void session_lock(struct ltt_session *session);
 void session_lock_list(void);
 int session_trylock_list(void);
@@ -190,6 +199,8 @@ void session_unlock(struct ltt_session *session);
 void session_unlock_list(void);
 
 void session_destroy(struct ltt_session *session);
+int session_add_destroy_notifier(struct ltt_session *session,
+		ltt_session_destroy_notifier notifier, void *user_data);
 
 bool session_get(struct ltt_session *session);
 void session_put(struct ltt_session *session);
@@ -202,7 +213,7 @@ void session_get_net_consumer_ports(
 		const struct ltt_session *session,
 		uint16_t *control_port, uint16_t *data_port);
 struct lttng_trace_archive_location *session_get_trace_archive_location(
-		struct ltt_session *session);
+		const struct ltt_session *session);
 
 struct ltt_session *session_find_by_name(const char *name);
 struct ltt_session *session_find_by_id(uint64_t id);
@@ -217,7 +228,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);
 
@@ -238,6 +250,9 @@ int session_set_trace_chunk(struct ltt_session *session,
  * ltt_session itself.
  */
 int session_close_trace_chunk(const struct ltt_session *session,
-		struct lttng_trace_chunk *trace_chunk);
+		struct lttng_trace_chunk *trace_chunk,
+		const enum lttng_trace_chunk_command_type *close_command);
+
+bool session_output_supports_trace_chunks(const struct ltt_session *session);
 
 #endif /* _LTT_SESSION_H */