aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2014-06-09 14:53:51 +0100
committerPedro Alves <palves@redhat.com>2014-06-09 14:53:51 +0100
commit9caaaa8397d0d123b94d05dc7a2206b8be39727e (patch)
tree706e3f4e7b5200002c463c9b1b552478880be6f5
parent3657956bf8aa891be280a38bdb59bbcd99edd21b (diff)
downloadgdb-9caaaa8397d0d123b94d05dc7a2206b8be39727e.zip
gdb-9caaaa8397d0d123b94d05dc7a2206b8be39727e.tar.gz
gdb-9caaaa8397d0d123b94d05dc7a2206b8be39727e.tar.bz2
Fix a bunch of fork related regressions.
I'm seeing a ton of new FAILs in fork-related tests. Like, these and many more: +FAIL: gdb.base/disp-step-syscall.exp: vfork: continue to vfork (2nd time) (timeout) +FAIL: gdb.base/disp-step-syscall.exp: vfork: display/i $pc (timeout) ... -PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, through step: step +FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, through step: step (timeout) -PASS: gdb.base/foll-vfork.exp: exec: vfork parent follow, to bp: continue to bp +FAIL: gdb.base/foll-vfork.exp: exec: vfork parent follow, to bp: continue to bp (timeout) ... FAIL: gdb.threads/watchpoint-fork.exp: parent: multithreaded: breakpoint (A) after the first fork (timeout) FAIL: gdb.threads/watchpoint-fork.exp: parent: multithreaded: watchpoint A after the first fork (timeout) FAIL: gdb.base/fileio.exp: System(3) call (timeout) FAIL: gdb.threads/watchpoint-fork.exp: parent: multithreaded: watchpoint B after the first fork (timeout) -PASS: gdb.base/multi-forks.exp: run to exit 2 +FAIL: gdb.base/multi-forks.exp: run to exit 2 (timeout) ... PASS: gdb.base/watch-vfork.exp: Watchpoint on global variable (hw) -PASS: gdb.base/watch-vfork.exp: Watchpoint triggers after vfork (hw) +FAIL: gdb.base/watch-vfork.exp: Watchpoint triggers after vfork (hw) (timeout) PASS: gdb.base/watch-vfork.exp: Watchpoint on global variable (sw) -PASS: gdb.base/watch-vfork.exp: Watchpoint triggers after vfork (sw) +FAIL: gdb.base/watch-vfork.exp: Watchpoint triggers after vfork (sw) (timeout) Three issues with https://sourceware.org/ml/gdb-patches/2014-06/msg00348.html (c077881a). - The inner 'status' local is shadowing the outer 'status' local, thus PTRACE_DETACH is never seeing the status it intends to pass on the inferior. - With that fixed, we then try to pass down the SIGTRAP that results from the step to the inferior. Need to filter out signals that are in nopass state. - For software single-step archs, the current code is equivalent to: int status = 0; if (WIFSTOPPED (status)) ptrace (PTRACE_DETACH, child_pid, 0, WSTOPSIG (status)); ... and status == 0 is WIFEXITED, not WIFSTOPPED, so we're never detaching. gdb/ 2014-06-09 Pedro Alves <palves@redhat.com> * linux-nat.c (linux_child_follow_fork): Initialize status with W_STOPCODE (0) instead of 0. Remove shodowing 'status' local from inner block. Only pass the signal to PTRACE_DETACH if in pass state.
-rw-r--r--gdb/linux-nat.c14
-rw-r--r--gdb/testsuite/ChangeLog7
2 files changed, 17 insertions, 4 deletions
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 3b117b5..c9677ca 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -414,7 +414,7 @@ holding the child stopped. Try \"set detach-on-fork\" or \
if (detach_fork)
{
struct cleanup *old_chain;
- int status = 0;
+ int status = W_STOPCODE (0);
/* Before detaching from the child, remove all breakpoints
from it. If we forked, then this has already been taken
@@ -460,8 +460,6 @@ holding the child stopped. Try \"set detach-on-fork\" or \
if (!gdbarch_software_single_step_p (target_thread_architecture
(child_lp->ptid)))
{
- int status;
-
linux_disable_event_reporting (child_pid);
if (ptrace (PTRACE_SINGLESTEP, child_pid, 0, 0) < 0)
perror_with_name (_("Couldn't do single step"));
@@ -470,7 +468,15 @@ holding the child stopped. Try \"set detach-on-fork\" or \
}
if (WIFSTOPPED (status))
- ptrace (PTRACE_DETACH, child_pid, 0, WSTOPSIG (status));
+ {
+ int signo;
+
+ signo = WSTOPSIG (status);
+ if (signo != 0
+ && !signal_pass_state (gdb_signal_from_host (signo)))
+ signo = 0;
+ ptrace (PTRACE_DETACH, child_pid, 0, signo);
+ }
do_cleanups (old_chain);
}
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2b5cca3..6c78bdd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-09 Pedro Alves <palves@redhat.com>
+
+ * linux-nat.c (linux_child_follow_fork): Initialize status with
+ W_STOPCODE (0) instead of 0. Remove shodowing 'status' local from
+ inner block. Only pass the signal to PTRACE_DETACH if in pass
+ state.
+
2014-06-09 Gary Benson <gbenson@redhat.com>
* gdb.base/sigall.c [Functions to send signals]: Reorder to