Cleanup: ust start/stop trace

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

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index e2b7a083c0ecb33eb95db9c8789abe34c154f2f8..f88df7406ea567049321b6c508fdc5b249a4ff35 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -3921,6 +3921,24 @@ void ust_app_clean_list(void)
 
        rcu_read_lock();
 
+       /* Cleanup notify socket hash table */
+       if (ust_app_ht_by_notify_sock) {
+               cds_lfht_for_each_entry(ust_app_ht_by_notify_sock->ht, &iter.iter, app,
+                               notify_sock_n.node) {
+                       struct cds_lfht_node *node;
+                       struct ust_app *app;
+
+                       node = cds_lfht_iter_get_node(&iter.iter);
+                       if (!node) {
+                               continue;
+                       }
+
+                       app = container_of(node, struct ust_app,
+                                       notify_sock_n.node);
+                       ust_app_notify_sock_unregister(app->notify_sock);
+               }
+       }
+
        if (ust_app_ht) {
                cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
                        ret = lttng_ht_del(ust_app_ht, &iter);
@@ -3938,14 +3956,6 @@ void ust_app_clean_list(void)
                }
        }
 
-       /* Cleanup notify socket hash table */
-       if (ust_app_ht_by_notify_sock) {
-               cds_lfht_for_each_entry(ust_app_ht_by_notify_sock->ht, &iter.iter, app,
-                               notify_sock_n.node) {
-                       ret = lttng_ht_del(ust_app_ht_by_notify_sock, &iter);
-                       assert(!ret);
-               }
-       }
        rcu_read_unlock();
 
        /* Destroy is done only when the ht is empty */
@@ -4986,6 +4996,12 @@ int ust_app_start_trace_all(struct ltt_ust_session *usess)
 
        DBG("Starting all UST traces");
 
+       /*
+        * Even though the start trace might fail, flag this session active so
+        * other application coming in are started by default.
+        */
+       usess->active = 1;
+
        rcu_read_lock();
 
        /*
@@ -5021,6 +5037,12 @@ int ust_app_stop_trace_all(struct ltt_ust_session *usess)
 
        DBG("Stopping all UST traces");
 
+       /*
+        * Even though the stop trace might fail, flag this session inactive so
+        * other application coming in are not started by default.
+        */
+       usess->active = 0;
+
        rcu_read_lock();
 
        cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {