From 13bb1ffb912cacea4041910e38674e0984ac5772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 1 Jul 2021 11:06:45 +0200 Subject: [PATCH] core: add comment explaining event source deallocation Followup for bc989831e6. The original reproducer still works w/o the unref, and doesn't work with this change. --- src/core/service.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/service.c b/src/core/service.c index 8517d5441c..cb0a528f0d 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -3384,11 +3384,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { else clean_mode = EXIT_CLEAN_DAEMON; - if (s->main_pid == pid) - /* Clean up the exec_fd event source. The source owns its end of the pipe, so this will close - * that too. */ - s->exec_fd_event_source = sd_event_source_disable_unref(s->exec_fd_event_source); - if (is_clean_exit(code, status, clean_mode, &s->success_status)) f = SERVICE_SUCCESS; else if (code == CLD_EXITED) @@ -3401,6 +3396,11 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert_not_reached("Unknown code"); if (s->main_pid == pid) { + /* Clean up the exec_fd event source. We want to do this here, not later in + * service_set_state(), because service_enter_stop_post() calls service_spawn(). + * The source owns its end of the pipe, so this will close that too. */ + s->exec_fd_event_source = sd_event_source_disable_unref(s->exec_fd_event_source); + /* Forking services may occasionally move to a new PID. * As long as they update the PID file before exiting the old * PID, they're fine. */