Cleanup: ust_session_id unused by buffer_reg_uid_consumer_channel_key

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

diff --git a/src/bin/lttng-sessiond/buffer-registry.h b/src/bin/lttng-sessiond/buffer-registry.h
index d17bbab623d5ae34a707d46b9d6bbf871213a8c7..d0d1575fd47e478ea57b6ae91aca6af6effd3189 100644 (file)
--- a/src/bin/lttng-sessiond/buffer-registry.h
+++ b/src/bin/lttng-sessiond/buffer-registry.h
@@ -89,6 +89,7 @@ struct buffer_reg_uid {
        /* Node of a linked list used to teardown object at a destroy session. */
        struct cds_list_head lnode;
 
+       char root_shm_path[PATH_MAX];
        char shm_path[PATH_MAX];
 };
 
@@ -103,6 +104,7 @@ struct buffer_reg_pid {
        /* Indexed by session id. */
        struct lttng_ht_node_u64 node;
 
+       char root_shm_path[PATH_MAX];
        char shm_path[PATH_MAX];
 };
 
@@ -110,7 +112,7 @@ struct buffer_reg_pid {
 void buffer_reg_init_uid_registry(void);
 int buffer_reg_uid_create(uint64_t session_id, uint32_t bits_per_long, uid_t uid,
                enum lttng_domain_type domain, struct buffer_reg_uid **regp,
-               const char *shm_path);
+               const char *root_shm_path, const char *shm_path);
 void buffer_reg_uid_add(struct buffer_reg_uid *reg);
 struct buffer_reg_uid *buffer_reg_uid_find(uint64_t session_id,
                uint32_t bits_per_long, uid_t uid);
@@ -121,7 +123,7 @@ void buffer_reg_uid_destroy(struct buffer_reg_uid *regp,
 /* Buffer registry per PID. */
 void buffer_reg_init_pid_registry(void);
 int buffer_reg_pid_create(uint64_t session_id, struct buffer_reg_pid **regp,
-               const char *shm_path);
+               const char *root_shm_path, const char *shm_path);
 void buffer_reg_pid_add(struct buffer_reg_pid *reg);
 struct buffer_reg_pid *buffer_reg_pid_find(uint64_t session_id);
 void buffer_reg_pid_remove(struct buffer_reg_pid *regp);
@@ -148,4 +150,8 @@ void buffer_reg_stream_destroy(struct buffer_reg_stream *regp,
 /* Global registry. */
 void buffer_reg_destroy_registries(void);
 
+int buffer_reg_uid_consumer_channel_key(
+               struct cds_list_head *buffer_reg_uid_list,
+               uint64_t chan_key, uint64_t *consumer_chan_key);
+
 #endif /* LTTNG_BUFFER_REGISTRY_H */