diff options
author | Pedro Alves <palves@redhat.com> | 2016-04-12 16:49:31 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-04-12 16:57:10 +0100 |
commit | 93692b589dc7017d5a2fbdffdfad5f84f597d8f1 (patch) | |
tree | 00da39a59755226ec1167996ac644f258a091b4f /gdb/target.c | |
parent | e42de8c7f8e7326d284f8b53f3bd6971fbf6e7b7 (diff) | |
download | gdb-93692b589dc7017d5a2fbdffdfad5f84f597d8f1.zip gdb-93692b589dc7017d5a2fbdffdfad5f84f597d8f1.tar.gz gdb-93692b589dc7017d5a2fbdffdfad5f84f597d8f1.tar.bz2 |
Pass Ctrl-C to the target in target_terminal_inferior
If the user presses Ctrl-C immediately before target_terminal_inferior
is called and the target is resumed, instead of after, the Ctrl-C ends
up pending in the quit flag until the target next stops.
remote.c has this bit to handle this:
if (!target_is_async_p ())
{
ofunc = signal (SIGINT, sync_remote_interrupt);
/* If the user hit C-c before this packet, or between packets,
pretend that it was hit right here. */
if (check_quit_flag ())
sync_remote_interrupt (SIGINT);
}
But that's only reachable if async is off, while async is on by
default nowadays. It's also obviously not reacheable on native
targets.
This patch generalizes that to all targets.
We can't remove that remote.c bit yet, until we get rid of the sync
SIGINT handler though. That'll be done later in the series.
gdb/ChangeLog:
2016-04-12 Pedro Alves <palves@redhat.com>
* remote.c (remote_pass_ctrlc): New function.
(init_remote_ops): Install it.
* target.c (target_terminal_inferior): Pass pending Ctrl-C to the
target.
(target_pass_ctrlc, default_target_pass_ctrlc): New functions.
* target.h (struct target_ops) <to_pass_ctrlc>: New method.
(target_pass_ctrlc, default_target_pass_ctrlc): New declarations.
* target-delegates.c: Regenerate.
Diffstat (limited to 'gdb/target.c')
-rw-r--r-- | gdb/target.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gdb/target.c b/gdb/target.c index ac66a3a..d580983 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -491,6 +491,11 @@ target_terminal_inferior (void) inferior's terminal modes. */ (*current_target.to_terminal_inferior) (¤t_target); terminal_state = terminal_is_inferior; + + /* If the user hit C-c before, pretend that it was hit right + here. */ + if (check_quit_flag ()) + target_pass_ctrlc (); } /* See target.h. */ @@ -3360,6 +3365,22 @@ target_interrupt (ptid_t ptid) /* See target.h. */ void +target_pass_ctrlc (void) +{ + (*current_target.to_pass_ctrlc) (¤t_target); +} + +/* See target.h. */ + +void +default_target_pass_ctrlc (struct target_ops *ops) +{ + target_interrupt (inferior_ptid); +} + +/* See target.h. */ + +void target_check_pending_interrupt (void) { (*current_target.to_check_pending_interrupt) (¤t_target); |