From de4ca854d8a677a07906c0d88cda18c47982bb1f Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Thu, 12 Jul 2001 19:37:36 +0000 Subject: [PATCH] * lin-lwp.c (stop_wait_callback): Add support for flushing signals. Use that in favour of the old code to get rid of superfluous SIGINTs. (lin_lwp_wait): Use the new support in stop_wait_callback to flush all but one SIGINT. --- gdb/ChangeLog | 6 ++++++ gdb/lin-lwp.c | 39 +++++++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 95ea9a0c534..fe1b460d1fd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2001-07-12 Mark Kettenis + * lin-lwp.c (stop_wait_callback): Add support for flushing + signals. Use that in favour of the old code to get rid of + superfluous SIGINTs. + (lin_lwp_wait): Use the new support in stop_wait_callback to + flush all but one SIGINT. + * i386-tdep.c (i386_extract_return_value): Undo 2001-07-11 changes to comment. (i386_store_return_value): Improve comments about storing diff --git a/gdb/lin-lwp.c b/gdb/lin-lwp.c index 66fedc579e9..61228a0385d 100644 --- a/gdb/lin-lwp.c +++ b/gdb/lin-lwp.c @@ -595,11 +595,14 @@ stop_callback (struct lwp_info *lp, void *data) return 0; } -/* Wait until LP is stopped. */ +/* Wait until LP is stopped. If DATA is non-null it is interpreted as + a pointer to a set of signals to be flushed immediately. */ static int stop_wait_callback (struct lwp_info *lp, void *data) { + sigset_t *flush_mask = data; + if (! lp->stopped && lp->signalled) { pid_t pid; @@ -639,6 +642,13 @@ stop_wait_callback (struct lwp_info *lp, void *data) gdb_assert (WIFSTOPPED (status)); + /* Ignore any signals in FLUSH_MASK. */ + if (flush_mask && sigismember (flush_mask, WSTOPSIG (status))) + { + ptrace (PTRACE_CONT, GET_LWP (lp->ptid), 0, 0); + return stop_wait_callback (lp, flush_mask); + } + if (WSTOPSIG (status) != SIGSTOP) { if (WSTOPSIG (status) == SIGTRAP) @@ -673,18 +683,6 @@ stop_wait_callback (struct lwp_info *lp, void *data) lp->status = status; return 0; } - else if (WSTOPSIG (status) == SIGINT && - signal_pass_state (SIGINT) == 0) - { - /* Since SIGINT gets forwarded to the entire process group - (in the case where ^C/BREAK is typed at the tty/console), - just ignore all SIGINT events from all lwp's except for - the one that was caught by lin_lwp_wait. */ - - /* Now resume this LWP and get the SIGSTOP event. */ - ptrace (PTRACE_CONT, GET_LWP (lp->ptid), 0, 0); - return stop_wait_callback (lp, data); - } else { /* The thread was stopped with a signal other than @@ -897,6 +895,9 @@ lin_lwp_wait (ptid_t ptid, struct target_waitstatus *ourstatus) int options = 0; int status = 0; pid_t pid = PIDGET (ptid); + sigset_t flush_mask; + + sigemptyset (&flush_mask); /* Make sure SIGCHLD is blocked. */ if (! sigismember (&blocked_mask, SIGCHLD)) @@ -1113,6 +1114,16 @@ lin_lwp_wait (ptid_t ptid, struct target_waitstatus *ourstatus) status = 0; goto retry; } + + if (signo == TARGET_SIGNAL_INT + && signal_pass_state (signo) == 0) + { + /* If ^C/BREAK is typed at the tty/console, SIGINT gets + forwarded to the entire process group, that is, all LWP's + will receive it. Since we only want to report it once, + we try to flush it from all LWPs except this one. */ + sigaddset (&flush_mask, SIGINT); + } } /* This LWP is stopped now. */ @@ -1127,7 +1138,7 @@ lin_lwp_wait (ptid_t ptid, struct target_waitstatus *ourstatus) /* ... and wait until all of them have reported back that they're no longer running. */ - iterate_over_lwps (stop_wait_callback, NULL); + iterate_over_lwps (stop_wait_callback, &flush_mask); /* If we're not waiting for a specific LWP, choose an event LWP from among those that have had events. Giving equal priority to all -- 2.30.2