Cleanup: send_fds functions are not const-correct

[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 77bc2b1f12b8cf6c08a7fc402a953be4ce86a296..b1189cc87b80c35bc1910501d4a5e9283fac37ad 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -98,6 +98,11 @@ struct consumer_data {
         * consumer.
         */
        int channel_monitor_pipe;
+       /*
+        * Write-end of the channel rotation pipe to be passed to the
+        * consumer.
+        */
+       int channel_rotate_pipe;
        /*
         * The metadata socket object is handled differently and only created
         * locally in this object thus it's the only reference available in the
@@ -108,8 +113,8 @@ struct consumer_data {
        struct consumer_socket metadata_sock;
 
        /* consumer error and command Unix socket path */
-       char err_unix_sock_path[PATH_MAX];
-       char cmd_unix_sock_path[PATH_MAX];
+       const char *err_unix_sock_path;
+       const char *cmd_unix_sock_path;
 
        /*
         * This lock has two purposes. It protects any change to the consumer
@@ -140,6 +145,9 @@ struct consumer_net {
 
        /* Data path for network streaming. */
        struct lttng_uri data;
+
+       /* <hostname>/<session-name> */
+       char base_dir[PATH_MAX];
 };
 
 /*
@@ -163,9 +171,10 @@ struct consumer_output {
        uint32_t relay_minor_version;
 
        /*
-        * Subdirectory path name used for both local and network consumer.
+        * 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
@@ -178,9 +187,15 @@ struct consumer_output {
        unsigned int snapshot:1;
 
        union {
-               char trace_path[PATH_MAX];
+               char session_root_path[LTTNG_PATH_MAX];
                struct consumer_net net;
        } dst;
+
+       /*
+        * 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[LTTNG_PATH_MAX];
 };
 
 struct consumer_socket *consumer_find_socket(int key,
@@ -207,12 +222,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,
@@ -221,6 +237,8 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
                char *session_name, char *hostname, int session_live_timer);
 int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
                int pipe);
+int consumer_send_channel_rotate_pipe(struct consumer_socket *consumer_sock,
+               int pipe);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
                struct consumer_output *consumer);
 int consumer_recv_status_reply(struct consumer_socket *sock);
@@ -256,6 +274,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                uint64_t session_id_per_pid,
                unsigned int monitor,
                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,
@@ -304,4 +323,18 @@ 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);
 
+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,
+               bool *rotate_pending_relay);
+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_rotate_pending_relay(struct consumer_socket *socket,
+               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 */