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:56:39 +0100 |
| commit | e42de8c7f8e7326d284f8b53f3bd6971fbf6e7b7 (patch) | |
| tree | 572a89f31b64944a5772acbdb8331e2cec9bde38 /gdb/remote.c | |
| parent | a149683b0c277279d892c9617233643188a34251 (diff) | |
| download | gdb-e42de8c7f8e7326d284f8b53f3bd6971fbf6e7b7.zip gdb-e42de8c7f8e7326d284f8b53f3bd6971fbf6e7b7.tar.gz gdb-e42de8c7f8e7326d284f8b53f3bd6971fbf6e7b7.tar.bz2 | |
Decouple target_interrupt from all-stop/non-stop modes
In non-stop mode, "interrupt" results in a "stop with no signal",
while in all-stop mode, it results in a remote interrupt request /
stop with SIGINT. This is currently implemented in both the Linux and
remote target backends. Move it to the core code instead, making
target_interrupt specifically always about "Interrupting as if with
Ctrl-C", just like it is documented.
gdb/ChangeLog:
2016-04-12 Pedro Alves <palves@redhat.com>
* infcmd.c (interrupt_target_1): Call target_stop is in non-stop
mode.
* linux-nat.c (linux_nat_interrupt): Delete.
(linux_nat_add_target): Don't install linux_nat_interrupt.
* remote.c (remote_interrupt_ns): Change return type to void.
Throw error if interrupting the target is not supported.
(remote_interrupt): Don't call the remote_stop_ns/remote_stop_as.
Diffstat (limited to 'gdb/remote.c')
| -rw-r--r-- | gdb/remote.c | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index 443beac..1bd2bcf 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -5813,10 +5813,10 @@ remote_interrupt_as (void) /* Non-stop version of target_interrupt. Uses `vCtrlC' to interrupt the remote target. It is undefined which thread of which process - reports the interrupt. Returns true if the packet is supported by - the server, false otherwise. */ + reports the interrupt. Throws an error if the packet is not + supported by the server. */ -static int +static void remote_interrupt_ns (void) { struct remote_state *rs = get_remote_state (); @@ -5835,12 +5835,10 @@ remote_interrupt_ns (void) case PACKET_OK: break; case PACKET_UNKNOWN: - return 0; + error (_("No support for interrupting the remote target.")); case PACKET_ERROR: error (_("Interrupting target failed: %s"), rs->buf); } - - return 1; } /* Implement the to_stop function for the remote targets. */ @@ -5866,30 +5864,15 @@ remote_stop (struct target_ops *self, ptid_t ptid) static void remote_interrupt (struct target_ops *self, ptid_t ptid) { + struct remote_state *rs = get_remote_state (); + if (remote_debug) fprintf_unfiltered (gdb_stdlog, "remote_interrupt called\n"); - if (non_stop) - { - /* In non-stop mode, we always stop with no signal instead. */ - remote_stop_ns (ptid); - } + if (target_is_non_stop_p ()) + remote_interrupt_ns (); else - { - /* In all-stop, we emulate ^C-ing the remote target's - terminal. */ - if (target_is_non_stop_p ()) - { - if (!remote_interrupt_ns ()) - { - /* No support for ^C-ing the remote target. Stop it - (with no signal) instead. */ - remote_stop_ns (ptid); - } - } - else - remote_interrupt_as (); - } + remote_interrupt_as (); } /* Ask the user what to do when an interrupt is received. */ |