diff options
author | Pedro Alves <palves@redhat.com> | 2015-08-06 18:22:58 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2015-08-07 17:26:20 +0100 |
commit | bfedc46af315dc6484295699c35e05040d76d700 (patch) | |
tree | 8d40b327d379d576de014e255b096d2e5e32ae7e /gdb/remote-sim.c | |
parent | d55007b58352c0b5fd2817e003b6dcf4e3ee4c07 (diff) | |
download | fsf-binutils-gdb-bfedc46af315dc6484295699c35e05040d76d700.zip fsf-binutils-gdb-bfedc46af315dc6484295699c35e05040d76d700.tar.gz fsf-binutils-gdb-bfedc46af315dc6484295699c35e05040d76d700.tar.bz2 |
Fix interrupt-noterm.exp on targets always in non-stop
With "maint set target-non-stop on" we get:
@@ -66,13 +66,16 @@ Continuing.
interrupt
(gdb) PASS: gdb.base/interrupt-noterm.exp: interrupt
-Program received signal SIGINT, Interrupt.
-PASS: gdb.base/interrupt-noterm.exp: inferior received SIGINT
-testcase src/gdb/testsuite/gdb.base/interrupt-noterm.exp completed in 0 seconds
+[process 12119] #1 stopped.
+0x0000003615ebc6d0 in __nanosleep_nocancel () at ../sysdeps/unix/syscall-template.S:81
+81 T_PSEUDO (SYSCALL_SYMBOL, SYSCALL_NAME, SYSCALL_NARGS)
+FAIL: gdb.base/interrupt-noterm.exp: inferior received SIGINT (timeout)
+testcase src/gdb/testsuite/gdb.base/interrupt-noterm.exp completed in 10 seconds
That is, we get "[$thread] #1 stopped" instead of SIGINT.
The issue is that we don't currently distinguish send
"interrupt/ctrl-c" to target terminal vs "stop/pause" thread well;
both cases go through "target_stop".
And then, the native Linux backend (linux-nat.c) implements
target_stop with SIGSTOP in non-stop mode, and SIGINT in all-stop
mode. Since "maint set target-non-stop on" forces the backend to be
always running in non-stop mode, even though the user-visible behavior
is "set non-stop" is "off", "interrupt" causes a SIGSTOP instead of
the SIGINT the test expects.
Fix this by introducing a target_interrupt method to use in the
"interrupt/ctrl-c" case, so "set non-stop off" can always work the
same irrespective of "maint set target-non-stop on/off". I'm
explictly considering changing the "set non-stop on" behavior as out
of scope here.
Most of the patch is an across-the-board rename of to_stop hook
implementations to to_interrupt. The only targets where something
more than a rename is being done are linux-nat.c and remote.c, which
are the only targets that support async, and thus are the only ones
the core side calls target_stop on.
gdb/ChangeLog:
2015-08-07 Pedro Alves <palves@redhat.com>
* darwin-nat.c (darwin_stop): Rename to ...
(darwin_interrupt): ... this.
(_initialize_darwin_inferior): Adjust.
* gnu-nat.c (gnu_stop): Delete.
(gnu_target): Don't install gnu_stop.
* inf-ptrace.c (inf_ptrace_stop): Rename to ...
(inf_ptrace_interrupt): ... this.
(inf_ptrace_target): Adjust.
* infcmd.c (interrupt_target_1): Use target_interrupt instead of
target_stop.
* linux-nat (linux_nat_stop): Rename to ...
(linux_nat_interrupt): ... this.
(linux_nat_stop): Reimplement.
(linux_nat_add_target): Install linux_nat_interrupt.
* nto-procfs.c (nto_interrupt_twice): Rename to ...
(nto_handle_sigint_twice): ... this.
(nto_interrupt): Rename to ...
(nto_handle_sigint): ... this. Call target_interrupt instead of
target_stop.
(procfs_wait): Adjust.
(procfs_stop): Rename to ...
(procfs_interrupt): ... this.
(init_procfs_targets): Adjust.
* procfs.c (procfs_stop): Rename to ...
(procfs_interrupt): ... this.
(procfs_target): Adjust.
* remote-m32r-sdi.c (m32r_stop): Rename to ...
(m32r_interrupt): ... this.
(init_m32r_ops): Adjust.
* remote-sim.c (gdbsim_stop_inferior): Rename to ...
(gdbsim_interrupt_inferior): ... this.
(gdbsim_stop): Rename to ...
(gdbsim_interrupt): ... this.
(gdbsim_cntrl_c): Adjust.
(init_gdbsim_ops): Adjust.
* remote.c (sync_remote_interrupt): Adjust comments.
(remote_stop_as): Rename to ...
(remote_interrupt_as): ... this.
(remote_stop): Adjust comment.
(remote_interrupt): New function.
(init_remote_ops): Install remote_interrupt.
* target.c (target_interrupt): New function.
* target.h (struct target_ops) <to_interrupt>: New field.
(target_interrupt): New declaration.
* windows-nat.c (windows_stop): Rename to ...
(windows_interrupt): ... this.
* target-delegates.c: Regenerate.
Diffstat (limited to 'gdb/remote-sim.c')
-rw-r--r-- | gdb/remote-sim.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 82c129d..b228862 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -88,7 +88,7 @@ static void gdbsim_files_info (struct target_ops *target); static void gdbsim_mourn_inferior (struct target_ops *target); -static void gdbsim_stop (struct target_ops *self, ptid_t ptid); +static void gdbsim_interrupt (struct target_ops *self, ptid_t ptid); void simulator_command (char *args, int from_tty); @@ -894,17 +894,17 @@ gdbsim_resume (struct target_ops *ops, error (_("The program is not being run.")); } -/* Notify the simulator of an asynchronous request to stop. +/* Notify the simulator of an asynchronous request to interrupt. - The simulator shall ensure that the stop request is eventually + The simulator shall ensure that the interrupt request is eventually delivered to the simulator. If the call is made while the - simulator is not running then the stop request is processed when + simulator is not running then the interrupt request is processed when the simulator is next resumed. For simulators that do not support this operation, just abort. */ static int -gdbsim_stop_inferior (struct inferior *inf, void *arg) +gdbsim_interrupt_inferior (struct inferior *inf, void *arg) { struct sim_inferior_data *sim_data = get_sim_inferior_data (inf, SIM_INSTANCE_NEEDED); @@ -924,13 +924,13 @@ gdbsim_stop_inferior (struct inferior *inf, void *arg) } static void -gdbsim_stop (struct target_ops *self, ptid_t ptid) +gdbsim_interrupt (struct target_ops *self, ptid_t ptid) { struct sim_inferior_data *sim_data; if (ptid_equal (ptid, minus_one_ptid)) { - iterate_over_inferiors (gdbsim_stop_inferior, NULL); + iterate_over_inferiors (gdbsim_interrupt_inferior, NULL); } else { @@ -940,7 +940,7 @@ gdbsim_stop (struct target_ops *self, ptid_t ptid) error (_("Can't stop pid %d. No inferior found."), ptid_get_pid (ptid)); - gdbsim_stop_inferior (inf, NULL); + gdbsim_interrupt_inferior (inf, NULL); } } @@ -968,7 +968,7 @@ gdb_os_poll_quit (host_callback *p) static void gdbsim_cntrl_c (int signo) { - gdbsim_stop (NULL, minus_one_ptid); + gdbsim_interrupt (NULL, minus_one_ptid); } static ptid_t @@ -1326,7 +1326,7 @@ init_gdbsim_ops (void) gdbsim_ops.to_load = gdbsim_load; gdbsim_ops.to_create_inferior = gdbsim_create_inferior; gdbsim_ops.to_mourn_inferior = gdbsim_mourn_inferior; - gdbsim_ops.to_stop = gdbsim_stop; + gdbsim_ops.to_interrupt = gdbsim_interrupt; gdbsim_ops.to_thread_alive = gdbsim_thread_alive; gdbsim_ops.to_pid_to_str = gdbsim_pid_to_str; gdbsim_ops.to_stratum = process_stratum; |