lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

hurd: set sigaction for signal preemptors in arch-independent file

Browse Source 
Instead of having the arch-specific trampoline setup code detect whether
preemption happened or not, we'd rather pass it the sigaction. In the
future, this may also allow to change sa_flags from post_signal().
This commit is contained in:
Samuel Thibault
2020-12-26 17:57:52 +01:00
parent a39b95b975
commit e42efa01c9
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hurd/hurdsig.c
View File

@@ -624,6 +624,13 @@ post_signal (struct hurd_sigstate *ss,
enum { stop, ignore, core, term, handle } act;
int ss_suspended;
/* sigaction for preemptors */
struct sigaction preempt_sigaction = {
.sa_flags = SA_RESTART
};
struct sigaction *action;
/* Mark the signal as pending. */
void mark_pending (void)
{
@@ -780,12 +787,17 @@ post_signal (struct hurd_sigstate *ss,
/* Ignore the signal altogether. */
act = ignore;
else if (handler != SIG_ERR)
/* Run the preemption-provided handler. */
act = handle;
{
/* Run the preemption-provided handler. */
action = &preempt_sigaction;
act = handle;
}
else
{
/* No preemption. Do normal handling. */
action = & _hurd_sigstate_actions (ss) [signo];
if (!untraced && __sigismember (&_hurdsig_traced, signo))
{
/* We are being traced. Stop to tell the debugger of the signal. */
@@ -800,7 +812,7 @@ post_signal (struct hurd_sigstate *ss,
return NULL;
}
handler = _hurd_sigstate_actions (ss) [signo].sa_handler;
handler = action->sa_handler;
if (handler == SIG_DFL)
/* Figure out the default action for this signal. */
@@ -1072,7 +1084,7 @@ post_signal (struct hurd_sigstate *ss,
/* Call the machine-dependent function to set the thread up
to run the signal handler, and preserve its old context. */
scp = _hurd_setup_sighandler (ss, handler, signo, detail,
scp = _hurd_setup_sighandler (ss, action, handler, signo, detail,
wait_for_reply, &thread_state);
if (scp == NULL)
goto sigbomb;
@@ -1111,8 +1123,6 @@ post_signal (struct hurd_sigstate *ss,
}
}
struct sigaction *action = & _hurd_sigstate_actions (ss) [signo];
/* Backdoor extra argument to signal handler. */
scp->sc_error = detail->error;