Fix: rotation may never complete in per-PID buffering mode

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.h

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index 24c7a273c6dab0246b128d16456b4e1e41d76868..e9c7e31e31990eafde155956fb6a0f726cf95506 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -217,12 +217,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 +269,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,
@@ -312,7 +313,24 @@ int consumer_get_lost_packets(uint64_t session_id, uint64_t channel_key,
 
 /* 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);
+               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 */