X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=1844a1c695fce4e89808655309891c39dcbb817e;hp=cf6fe48c9e291bfc1caa62146461f5430098f428;hb=51a4828f21385847870ec2b2499e2f3e3842c26e;hpb=1e791a74976525f287944e5dbb65208a3b9edf42

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index cf6fe48c9..1844a1c69 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -152,6 +152,9 @@ struct consumer_output {
 	uint32_t relay_major_version;
 	uint32_t relay_minor_version;
 
+	/* True if relayd supports the clear feature. */
+	bool relay_allows_clear;
+
 	/*
 	 * Subdirectory path name used for both local and network
 	 * consumer ("kernel", "ust", or empty).
@@ -182,9 +185,9 @@ struct consumer_output {
 };
 
 struct consumer_socket *consumer_find_socket(int key,
-		struct consumer_output *consumer);
+		const struct consumer_output *consumer);
 struct consumer_socket *consumer_find_socket_by_bitness(int bits,
-		struct consumer_output *consumer);
+		const struct consumer_output *consumer);
 struct consumer_socket *consumer_allocate_socket(int *fd);
 void consumer_add_socket(struct consumer_socket *sock,
 		struct consumer_output *consumer);
@@ -219,7 +222,9 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
 		enum lttng_stream_type type, uint64_t session_id,
 		const char *session_name, const char *hostname,
-		int session_live_timer, const uint64_t *current_chunk_id);
+		const char *base_path, int session_live_timer,
+		const uint64_t *current_chunk_id, time_t session_creation_time,
+		bool session_name_contains_creation_time);
 int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
 		int pipe);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
@@ -256,7 +261,8 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		int64_t blocking_timeout,
 		const char *root_shm_path,
 		const char *shm_path,
-	        struct lttng_trace_chunk *trace_chunk);
+		struct lttng_trace_chunk *trace_chunk,
+		const struct lttng_credentials *buffer_credentials);
 void consumer_init_add_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t channel_key,
 		uint64_t stream_key,
@@ -299,7 +305,7 @@ int consumer_get_lost_packets(uint64_t session_id, uint64_t channel_key,
 
 /* Snapshot command. */
 enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
-		uint64_t key, const struct snapshot_output *output, int metadata,
+		uint64_t key, const struct consumer_output *output, int metadata,
 		uid_t uid, gid_t gid, const char *channel_path, int wait,
 		uint64_t nb_packets_per_stream);
 
@@ -312,13 +318,21 @@ int consumer_init(struct consumer_socket *socket,
 
 int consumer_create_trace_chunk(struct consumer_socket *socket,
 		uint64_t relayd_id, uint64_t session_id,
-		struct lttng_trace_chunk *chunk);
+		struct lttng_trace_chunk *chunk,
+		const char *domain_subdir);
 int consumer_close_trace_chunk(struct consumer_socket *socket,
 		uint64_t relayd_id, uint64_t session_id,
-		struct lttng_trace_chunk *chunk);
+		struct lttng_trace_chunk *chunk,
+		char *closed_trace_chunk_path);
 int consumer_trace_chunk_exists(struct consumer_socket *socket,
 		uint64_t relayd_id, uint64_t session_id,
 		struct lttng_trace_chunk *chunk,
 		enum consumer_trace_chunk_exists_status *result);
 
+char *setup_channel_trace_path(struct consumer_output *consumer,
+		const char *session_path, size_t *consumer_path_offset);
+
+/* Clear command */
+int consumer_clear_channel(struct consumer_socket *socket, uint64_t key);
+
 #endif /* _CONSUMER_H */