shm-path: remove directory hierarchy on destroy

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

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index f83e857cfae0f36b17e8fe4159a6e538cbbf9af9..d6b675bec36dcd357b05e027dcf7b7a98e0015b7 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -22,7 +22,7 @@
 
 #include <common/compat/uuid.h>
 
-#include "jul.h"
+#include "agent.h"
 #include "trace-ust.h"
 #include "ust-registry.h"
 
@@ -215,6 +215,9 @@ struct ust_app_session {
 
        /* Metadata channel attributes. */
        struct ustctl_consumer_channel_attr metadata_attr;
+
+       char root_shm_path[PATH_MAX];
+       char shm_path[PATH_MAX];
 };
 
 /*
@@ -266,13 +269,14 @@ struct ust_app {
         * Hash table containing ust_app_channel indexed by channel objd.
         */
        struct lttng_ht *ust_objd;
+
        /*
-        * If this application is of the JUL domain and this is non negative then a
-        * lookup MUST be done to acquire a read side reference to the
-        * corresponding JUL app object. If the lookup fails, this should be set to
-        * a negative value indicating that the JUL application is gone.
+        * If this application is of the agent domain and this is non negative then
+        * a lookup MUST be done to acquire a read side reference to the
+        * corresponding agent app object. If the lookup fails, this should be set
+        * to a negative value indicating that the agent application is gone.
         */
-       int jul_app_sock;
+       int agent_app_sock;
 };
 
 #ifdef HAVE_LIBLTTNG_UST_CTL
@@ -312,7 +316,7 @@ int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess,
 void ust_app_global_update(struct ltt_ust_session *usess, int sock);
 
 void ust_app_clean_list(void);
-void ust_app_ht_alloc(void);
+int ust_app_ht_alloc(void);
 struct ust_app *ust_app_find_by_pid(pid_t pid);
 int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate);
 struct ust_app_stream *ust_app_alloc_stream(void);
@@ -325,8 +329,10 @@ ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
                struct consumer_socket *socket, int send_zero_data);
 void ust_app_destroy(struct ust_app *app);
 int ust_app_snapshot_record(struct ltt_ust_session *usess,
-               struct snapshot_output *output, int wait, uint64_t max_stream_size);
-unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess);
+               struct snapshot_output *output, int wait,
+               uint64_t nb_packets_per_stream);
+uint64_t ust_app_get_size_one_more_packet_per_stream(
+               struct ltt_ust_session *usess, uint64_t cur_nr_packets);
 struct ust_app *ust_app_find_by_sock(int sock);
 
 static inline
@@ -409,8 +415,10 @@ struct ust_app *ust_app_get_by_pid(pid_t pid)
        return NULL;
 }
 static inline
-void ust_app_ht_alloc(void)
-{}
+int ust_app_ht_alloc(void)
+{
+       return 0;
+}
 static inline
 void ust_app_global_update(struct ltt_ust_session *usess, int sock)
 {}
@@ -535,6 +543,11 @@ struct ust_app *ust_app_find_by_pid(pid_t pid)
 {
        return NULL;
 }
+static inline
+uint64_t ust_app_get_size_one_more_packet_per_stream(
+               struct ltt_ust_session *usess, uint64_t cur_nr_packets) {
+       return 0;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */