X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;fp=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=750b4b32904511e37925e7e559bb92208f0c341c;hp=a49600ec60d42f9f0b7c91ec7c31a810ed985748;hb=cd9c532cd057a13ca7e1fde757ae20d40d831a20;hpb=761ffce23895ccf66a7a410b9037fa3f128fb20a

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index a49600ec6..750b4b329 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -4067,13 +4067,29 @@ int ust_app_setup_event_notifier_group(struct ust_app *app)
 
 	event_notifier_error_accounting_status = event_notifier_error_accounting_register_app(app);
 	if (event_notifier_error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+		if (event_notifier_error_accounting_status == EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_APP_DEAD) {
+			DBG3("Failed to setup event notifier error accounting (application is dead): app socket fd = %d",
+					app->sock);
+			ret = 0;
+			goto error_accounting;
+		}
+
 		ERR("Failed to setup event notifier error accounting for app");
 		ret = -1;
-		goto error;
+		goto error_accounting;
 	}
 
 	return ret;
 
+error_accounting:
+	lttng_ret = notification_thread_command_remove_tracer_event_source(
+			the_notification_thread_handle,
+			lttng_pipe_get_readfd(
+					app->event_notifier_group.event_pipe));
+	if (lttng_ret != LTTNG_OK) {
+		ERR("Failed to remove application tracer event source from notification thread");
+	}
+
 error:
 	ustctl_release_object(app->sock, app->event_notifier_group.object);
 	free(app->event_notifier_group.object);