Change trace_path to session_root_path and chunk_path

[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..9186d2f2be19a1ac325a8789734db218947a0cae 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -108,8 +108,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
@@ -163,7 +163,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 +179,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,
@@ -256,6 +263,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,