Fix: update apps on untrack only when session is active

This mimics what is done on the track side.

Fixes #1210

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index cc166fd6f9413824e3a22f37016f73e704560dc8..fc3f3a7a037933b7e817dfcf75bd2a4bd9d7e601 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -883,6 +883,7 @@ end:
 int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
 {
        int retval = LTTNG_OK;
+       bool should_update_apps = false;
 
        if (pid == -1) {
                /* Create empty tracker, replace old tracker. */
@@ -899,7 +900,7 @@ int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
                fini_pid_tracker(&tmp_tracker);
 
                /* Remove session from all applications */
-               ust_app_global_update_all(session);
+               should_update_apps = true;
        } else {
                int ret;
                struct ust_app *app;
@@ -918,9 +919,12 @@ int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
                /* Remove session from application. */
                app = ust_app_find_by_pid(pid);
                if (app) {
-                       ust_app_global_update(session, app);
+                       should_update_apps = true;
                }
        }
+       if (should_update_apps && session->active) {
+               ust_app_global_update_all(session);
+       }
 end:
        return retval;
 }