From 3b3bc070f802491e98f87d9191e7d33fec78dd5a Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sat, 19 Oct 2024 21:32:04 +0300 Subject: : perhaps fixed race conditions and problems when creating and terminating process groups on Win32 * Sometimes already the job assignment failed in CI builds. We now check whether the process is still alive before throwing an error. * We now set the JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE flag. This theoretically shouldn't be necessary when using TerminateJobObject(), but who knows. --- src/spawn.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'src/spawn.c') diff --git a/src/spawn.c b/src/spawn.c index e6d620c..a1b8ac8 100644 --- a/src/spawn.c +++ b/src/spawn.c @@ -294,15 +294,35 @@ teco_state_execute_done(teco_machine_main_t *ctx, const teco_string_t *str, GErr teco_spawn_ctx.interrupted = FALSE; #ifdef G_OS_WIN32 + teco_spawn_ctx.pid = CreateJobObject(NULL, NULL); + if (!teco_spawn_ctx.pid) { + teco_error_win32_set(error, "Cannot create job object", GetLastError()); + goto gerror; + } + JOBOBJECT_EXTENDED_LIMIT_INFORMATION job_info = { + .BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE + }; + if (!SetInformationJobObject(teco_spawn_ctx.pid, JobObjectExtendedLimitInformation, + &job_info, sizeof(job_info))) { + CloseHandle(teco_spawn_ctx.pid); + teco_error_win32_set(error, "Cannot configure job object", GetLastError()); + goto gerror; + } /* * Assigning the process to a job object will allow us to * kill the entire process tree relatively easily and without * race conditions. + * There can however be a race condition while assigning the + * job object since the process could already be dead. */ - teco_spawn_ctx.pid = CreateJobObjectA(NULL, NULL); - if (!teco_spawn_ctx.pid || !AssignProcessToJobObject(teco_spawn_ctx.pid, pid)) { - g_set_error(error, TECO_ERROR, TECO_ERROR_FAILED, - "Cannot assign process to job object (%lu)", GetLastError()); + DWORD exit_code; + if (!AssignProcessToJobObject(teco_spawn_ctx.pid, pid) && + (GetLastError() != ERROR_ACCESS_DENIED || + !GetExitCodeProcess(teco_spawn_ctx.pid, &exit_code) || + exit_code == STILL_ACTIVE)) { + CloseHandle(teco_spawn_ctx.pid); + teco_error_win32_set(error, "Cannot assign process to job object", + GetLastError()); goto gerror; } -- cgit v1.2.3