public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Jon Turney <jturney@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Restore signal handlers on thread cancellation during system() Date: Tue, 18 Jul 2023 15:47:31 +0000 (GMT) [thread overview] Message-ID: <20230718154731.894573857351@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=89e80d414b9d4ec71c6d43503704f7b3da3a2407 commit 89e80d414b9d4ec71c6d43503704f7b3da3a2407 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Sun Jul 16 14:46:00 2023 +0100 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: 3cb9da14617c ("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> Diff: --- winsup/cygwin/spawn.cc | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 84dd74e28..c16fe269a 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -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;
reply other threads:[~2023-07-18 15:47 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230718154731.894573857351@sourceware.org \ --to=jturney@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).