X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=0e7ed0017a5a9d42f2b15b5ff5c8c074ba3051d9;hp=ddc94d7148e5c3cc91be34f98b0a924374862fba;hb=4ec029ed8d032ac98d8dc158a751841b7c150639;hpb=2b29c638278807c1536634ce49f0c9c053b3ab5f

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index ddc94d714..0e7ed0017 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -66,26 +66,6 @@ struct consumer_socket {
 struct consumer_data {
 	enum lttng_consumer_type type;
 
-	pthread_t thread;	/* Worker thread interacting with the consumer */
-
-	/* Conditions used by the consumer thread to indicate readiness. */
-	pthread_cond_t cond;
-	pthread_condattr_t condattr;
-	pthread_mutex_t cond_mutex;
-
-	/*
-	 * This is a flag condition indicating that the consumer thread is ready
-	 * and connected to the lttng-consumerd daemon. This flag MUST only be
-	 * updated by locking the condition mutex above or before spawning a
-	 * consumer thread.
-	 *
-	 * A value of 0 means that the thread is NOT ready. A value of 1 means that
-	 * the thread consumer did connect successfully to the lttng-consumerd
-	 * daemon. A negative value indicates that there is been an error and the
-	 * thread has likely quit.
-	 */
-	int consumer_thread_is_ready;
-
 	/* Mutex to control consumerd pid assignation */
 	pthread_mutex_t pid_mutex;
 	pid_t pid;
@@ -169,7 +149,7 @@ struct consumer_output {
 	 * Subdirectory path name used for both local and network
 	 * consumer (/kernel or /ust).
 	 */
-	char subdir[PATH_MAX];
+	char subdir[LTTNG_PATH_MAX];
 
 	/*
 	 * Hashtable of consumer_socket index by the file descriptor value. For
@@ -182,7 +162,7 @@ struct consumer_output {
 	unsigned int snapshot:1;
 
 	union {
-		char session_root_path[PATH_MAX];
+		char session_root_path[LTTNG_PATH_MAX];
 		struct consumer_net net;
 	} dst;
 
@@ -190,7 +170,7 @@ struct consumer_output {
 	 * Sub-directory below the session_root_path where the next chunk of
 	 * trace will be stored (\0 before the first session rotation).
 	 */
-	char chunk_path[PATH_MAX];
+	char chunk_path[LTTNG_PATH_MAX];
 };
 
 struct consumer_socket *consumer_find_socket(int key,
@@ -217,12 +197,13 @@ void consumer_output_get(struct consumer_output *obj);
 void consumer_output_put(struct consumer_output *obj);
 int consumer_set_network_uri(struct consumer_output *obj,
 		struct lttng_uri *uri);
-int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd);
+int consumer_send_fds(struct consumer_socket *sock, const int *fds,
+		size_t nb_fd);
 int consumer_send_msg(struct consumer_socket *sock,
 		struct lttcomm_consumer_msg *msg);
 int consumer_send_stream(struct consumer_socket *sock,
 		struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
-		int *fds, size_t nb_fd);
+		const int *fds, size_t nb_fd);
 int consumer_send_channel(struct consumer_socket *sock,
 		struct lttcomm_consumer_msg *msg);
 int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
@@ -268,17 +249,17 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint32_t ust_app_uid,
 		int64_t blocking_timeout,
 		const char *root_shm_path,
-		const char *shm_path);
-void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
-		enum lttng_consumer_command cmd,
+		const char *shm_path,
+		uint64_t trace_archive_id);
+void consumer_init_add_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t channel_key,
 		uint64_t stream_key,
-		int cpu);
+		int32_t cpu,
+		uint64_t trace_archive_id);
 void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
 		enum lttng_consumer_command cmd,
 		uint64_t channel_key, uint64_t net_seq_idx);
-void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
-		enum lttng_consumer_command cmd,
+void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t channel_key,
 		uint64_t session_id,
 		const char *pathname,
@@ -311,8 +292,25 @@ int consumer_get_lost_packets(uint64_t session_id, uint64_t channel_key,
 		struct consumer_output *consumer, uint64_t *lost);
 
 /* Snapshot command. */
-int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
-		struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
-		const char *session_path, int wait, uint64_t nb_packets_per_stream);
+enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
+		uint64_t key, struct snapshot_output *output, int metadata,
+		uid_t uid, gid_t gid, const char *session_path, int wait,
+		uint64_t nb_packets_per_stream, uint64_t trace_archive_id);
+
+/* Rotation commands. */
+int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
+		uid_t uid, gid_t gid, struct consumer_output *output,
+		char *domain_path, bool is_metadata_channel, uint64_t new_chunk_id);
+int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
+		const struct consumer_output *output, const char *old_path,
+		const char *new_path, uid_t uid, gid_t gid);
+int consumer_check_rotation_pending_local(struct consumer_socket *socket,
+		uint64_t session_id, uint64_t chunk_id);
+int consumer_check_rotation_pending_relay(struct consumer_socket *socket,
+		const struct consumer_output *output, uint64_t session_id,
+		uint64_t chunk_id);
+int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id,
+		const struct consumer_output *output, const char *path,
+		uid_t uid, gid_t gid);
 
 #endif /* _CONSUMER_H */