libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cygwin: Restore signal handlers on thread cancellation during system() 

Add back the restoration of signal handlers modified during system() on
thread cancellation.

Removed in 3cb9da14 which describes it as 'ill-conceived' (additional
context doesn't appear to be available).

We use the internal implementation helpers for the pthread cleanup
chain, so we can neatly tuck it inside the object, and keep the point
when we restore the signal handlers the same. (The
pthread_cleanup_push/pop() functions are implemented as macros which
must appear in the same lexical scope.)

Fixes: 3cb9da1461 ("Put signals on hold and use system_call_cleanup
class to set and restore signals rather than doing it prior to to
running the program.  Remove the ill-conceived pthread_cleanup stuff.")
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon Turney 2023-07-16 14:46:00 +01:00
parent c431f6b7fe
commit 89e80d414b
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
winsup/cygwin/spawn.cc
View File

@ -228,6 +228,8 @@ struct system_call_handle
_sig_func_ptr oldint;
_sig_func_ptr oldquit;
sigset_t oldmask;
__pthread_cleanup_handler cleanup_handler;
bool is_system_call ()
{
return oldint != ILLEGAL_SIG_FUNC_PTR;
@ -253,18 +255,27 @@ struct system_call_handle
sigaddset (&child_block, SIGCHLD);
sigprocmask (SIG_BLOCK, &child_block, &oldmask);
sig_send (NULL, __SIGNOHOLD);
cleanup_handler = { system_call_handle::cleanup, this, NULL };
_pthread_cleanup_push (&cleanup_handler);
}
}
~system_call_handle ()
{
if (is_system_call ())
_pthread_cleanup_pop (1);
}
static void cleanup (void *arg)
{
# define this_ ((system_call_handle *) arg)
if (this_->is_system_call ())
{
signal (SIGINT, oldint);
signal (SIGQUIT, oldquit);
sigprocmask (SIG_SETMASK, &oldmask, NULL);
signal (SIGINT, this_->oldint);
signal (SIGQUIT, this_->oldquit);
sigprocmask (SIG_SETMASK, &(this_->oldmask), NULL);
}
}
# undef cleanup
# undef this_
};
child_info_spawn NO_COPY ch_spawn;