Fix RCU-related hangs: incorrect lttng_ht_destroy use

[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 82694a722b976ebe494d44d88444512ecadc0aa6..6e6ff0203cdb9cc1ddf88a1d626f0cd96db5f033 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -143,6 +143,8 @@ struct ust_app_channel {
        struct ust_app_session *session;
        struct lttng_ht *ctx;
        struct lttng_ht *events;
+       uint64_t tracefile_size;
+       uint64_t tracefile_count;
        /*
         * Node indexed by channel name in the channels' hash table of a session.
         */
@@ -152,6 +154,8 @@ struct ust_app_channel {
         * ust_objd hash table in the ust_app object.
         */
        struct lttng_ht_node_ulong ust_objd_node;
+       /* For delayed reclaim */
+       struct rcu_head rcu_head;
 };
 
 struct ust_app_session {
@@ -191,6 +195,8 @@ struct ust_app_session {
        enum lttng_buffer_type buffer_type;
        /* ABI of the session. Same value as the application. */
        uint32_t bits_per_long;
+       /* For delayed reclaim */
+       struct rcu_head rcu_head;
 };
 
 /*
@@ -255,8 +261,6 @@ int ust_app_register_done(int sock)
 int ust_app_version(struct ust_app *app);
 void ust_app_unregister(int sock);
 unsigned long ust_app_list_count(void);
-int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app);
-int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app);
 int ust_app_start_trace_all(struct ltt_ust_session *usess);
 int ust_app_stop_trace_all(struct ltt_ust_session *usess);
 int ust_app_destroy_trace_all(struct ltt_ust_session *usess);