Fix: sessiond ust-app session teardown race

[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 66cda8c081518024feb120fdbf7b2f33be54ff03..b62e218a03a74842d8bcf08dc3dbef0471f6f01e 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -22,7 +22,6 @@
 
 #include <common/compat/uuid.h>
 
-#include "agent.h"
 #include "trace-ust.h"
 #include "ust-registry.h"
 
@@ -48,9 +47,9 @@ struct ust_app_notify_sock_obj {
 
 struct ust_app_ht_key {
        const char *name;
-       const struct lttng_ust_filter_bytecode *filter;
+       const struct lttng_filter_bytecode *filter;
        enum lttng_ust_loglevel_type loglevel;
-       const struct lttng_ust_event_exclusion *exclusion;
+       const struct lttng_event_exclusion *exclusion;
 };
 
 /*
@@ -115,8 +114,8 @@ struct ust_app_event {
        struct lttng_ust_event attr;
        char name[LTTNG_UST_SYM_NAME_LEN];
        struct lttng_ht_node_str node;
-       struct lttng_ust_filter_bytecode *filter;
-       struct lttng_ust_event_exclusion *exclusion;
+       struct lttng_filter_bytecode *filter;
+       struct lttng_event_exclusion *exclusion;
 };
 
 struct ust_app_stream {
@@ -183,6 +182,8 @@ struct ust_app_session {
        int started;  /* allows detection of start vs restart. */
        int handle;   /* used has unique identifier for app session */
 
+       bool deleted;   /* Session deleted flag. Check with lock held. */
+
        /*
         * Tracing session ID. Multiple ust app session can have the same tracing
         * session id making this value NOT unique to the object.