X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=3651e6c3e55ed997a4ee4c93f16cf75d9240a8d2;hp=9464c2c1b8e0f4f3d17ef300cf15975d2174c6ec;hb=84cd17c63cde7ea5d7a0ad037dd41e8297658812;hpb=8be98f9a4419d360bce0678981ba3f4b891b0a19

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 9464c2c1b..3651e6c3e 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -305,8 +305,14 @@ static void teardown_kernel_session(struct ltt_session *session)
  */
 static void teardown_ust_session(struct ltt_session *session)
 {
+	int ret;
+
 	DBG("Tearing down UST session(s)");
 
+	ret = ust_app_destroy_trace_all(session->ust_session);
+	if (ret) {
+		ERR("Error in ust_app_destroy_trace_all");
+	}
 	trace_ust_destroy_session(session->ust_session);
 }
 
@@ -2676,6 +2682,8 @@ static int cmd_destroy_session(struct ltt_session *session, char *name)
 
 	/* Clean kernel session teardown */
 	teardown_kernel_session(session);
+	/* UST session teardown */
+	teardown_ust_session(session);
 
 	/*
 	 * Must notify the kernel thread here to update it's poll setin order