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

Cygwin: revert use of CancelSyncronousIo on wait_thread. #243

Merged
merged 1 commit into from
Nov 23, 2024
Merged

Cygwin: revert use of CancelSyncronousIo on wait_thread. #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions winsup/cygwin/pinfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,17 +1262,13 @@ proc_waiter (void *arg)

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

if (!ReadFile (vchild.rd_proc_pipe, &buf, 1, &nb, NULL)
&& (err = GetLastError ()) != ERROR_BROKEN_PIPE)
&& GetLastError () != ERROR_BROKEN_PIPE)
{
/* ERROR_OPERATION_ABORTED is expected due to the possibility that
CancelSynchronousIo interruped the ReadFile call, so don't output
that error */
if (err != ERROR_OPERATION_ABORTED)
system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
system_printf ("error on read of child wait pipe %p, %E", vchild.rd_proc_pipe);
break;
}

Expand Down
12 changes: 2 additions & 10 deletions winsup/cygwin/sigproc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,7 @@ proc_terminate ()
to 1 iff it is a Cygwin process. */
if (!have_execed || !have_execed_cygwin)
chld_procs[i]->ppid = 1;
/* Attempt to exit the wait_thread cleanly via CancelSynchronousIo
before falling back to the (explicitly dangerous) cross-thread
termination */
if (chld_procs[i].wait_thread
&& !CancelSynchronousIo (chld_procs[i].wait_thread->thread_handle ()))
if (chld_procs[i].wait_thread)
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
Expand Down Expand Up @@ -1178,11 +1174,7 @@ remove_proc (int ci)
{
if (have_execed)
{
/* Attempt to exit the wait_thread cleanly via CancelSynchronousIo
before falling back to the (explicitly dangerous) cross-thread
termination */
if (_my_tls._ctinfo != chld_procs[ci].wait_thread
&& !CancelSynchronousIo (chld_procs[ci].wait_thread->thread_handle ()))
if (_my_tls._ctinfo != chld_procs[ci].wait_thread)
chld_procs[ci].wait_thread->terminate_thread ();
}
else if (chld_procs[ci] && chld_procs[ci]->exists ())
Expand Down