rename works on the relay

[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 b8d5630f472aed7b37e16a5ad9827fdb205bf0b0..66ee67310da744415697f59600130251e2ba9f44 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
@@ -140,6 +145,11 @@ struct consumer_net {
 
        /* Data path for network streaming. */
        struct lttng_uri data;
+
+       /*
+        * <hostname>/<session-name>
+        */
+       char base_dir[PATH_MAX];
 };
 
 /*
@@ -163,7 +173,8 @@ 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];
 
@@ -178,9 +189,15 @@ struct consumer_output {
        unsigned int snapshot:1;
 
        union {
-               char trace_path[PATH_MAX];
+               char session_root_path[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[PATH_MAX];
 };
 
 struct consumer_socket *consumer_find_socket(int key,
@@ -221,6 +238,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);
@@ -305,4 +324,11 @@ 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 *tmp, uint32_t metadata);
+int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
+               struct consumer_output *output, char *current_path, char *new_path,
+               uid_t uid, gid_t gid);
+
 #endif /* _CONSUMER_H */