Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix double-fork hang on Windows/ARM64 #73

Merged
merged 2 commits into from
Nov 14, 2024
Merged

Fix double-fork hang on Windows/ARM64 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf47028
cygthread: suspend thread before terminating.
jeremyd2019 Nov 12, 2024
54a7252
fixup! cygthread: suspend thread before terminating.
jeremyd2019 Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions winsup/cygwin/cygthread.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,20 @@ cygthread::terminate_thread ()
if (!inuse)
goto force_notterminated;

if (_my_tls._ctinfo != this)
{
CONTEXT context;
context.ContextFlags = CONTEXT_CONTROL;
/* SuspendThread makes sure a thread is "booted" from emulation before
it is suspended. As such, the emulator hopefully won't be in a bad
state (aka, holding any locks) when the thread is terminated. */
SuspendThread (h);
/* We need to call GetThreadContext, even though we don't care about the
context, because SuspendThread is asynchronous and GetThreadContext
will make sure the thread is *really* suspended before returning */
GetThreadContext (h, &context);
}

TerminateThread (h, 0);
WaitForSingleObject (h, INFINITE);
CloseHandle (h);
Expand Down
7 changes: 4 additions & 3 deletions winsup/cygwin/pinfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,13 +1262,14 @@ proc_waiter (void *arg)

for (;;)
{
DWORD nb;
DWORD nb, err;
char buf = '\0';

if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL)
&& GetLastError () != ERROR_BROKEN_PIPE)
&& (err = GetLastError ()) != ERROR_BROKEN_PIPE)
{
system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
if (err != ERROR_OPERATION_ABORTED)
system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
break;
}

Expand Down
3 changes: 2 additions & 1 deletion winsup/cygwin/sigproc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,8 @@ proc_terminate ()
if (!have_execed || !have_execed_cygwin)
chld_procs[i]->ppid = 1;
if (chld_procs[i].wait_thread)
chld_procs[i].wait_thread->terminate_thread ();
if (!CancelSynchronousIo (chld_procs[i].wait_thread->thread_handle ()))
chld_procs[i].wait_thread->terminate_thread ();
/* Release memory associated with this process unless it is 'myself'.
'myself' is only in the chld_procs table when we've execed. We
reach here when the next process has finished initializing but we
Expand Down