Index: gdb-6.8.50.20081128/gdb/linux-nat.c =================================================================== --- gdb-6.8.50.20081128.orig/gdb/linux-nat.c 2008-12-06 21:48:18.000000000 +0100 +++ gdb-6.8.50.20081128/gdb/linux-nat.c 2008-12-06 22:00:42.000000000 +0100 @@ -199,6 +199,9 @@ blocked. */ static struct target_ops *linux_ops; static struct target_ops linux_ops_saved; +/* PID of the inferior stopped by SIGSTOP before attaching (or zero). */ +static pid_t pid_was_stopped; + /* The method to call, if any, when a new thread is attached. */ static void (*linux_nat_new_thread) (ptid_t); @@ -871,7 +874,14 @@ linux_child_follow_fork (struct target_o fork_save_infrun_state (fp, 0); } else - target_detach (NULL, 0); + { + /* We should check PID_WAS_STOPPED and detach it stopped accordingly. + In this point of code it cannot be 1 as we would not get FORK + executed without CONTINUE first which resets PID_WAS_STOPPED. + We would have to first TARGET_STOP and WAITPID it as with running + inferior PTRACE_DETACH, SIGSTOP will ignore the signal. */ + target_detach (NULL, 0); + } inferior_ptid = ptid_build (child_pid, child_pid, 0); add_inferior (child_pid); @@ -1203,6 +1213,7 @@ linux_nat_post_attach_wait (ptid_t ptid, if (debug_linux_nat) fprintf_unfiltered (gdb_stdlog, "LNPAW: Attaching to a stopped process\n"); + pid_was_stopped = GET_PID (ptid); /* The process is definitely stopped. It is in a job control stop, unless the kernel predates the TASK_STOPPED / @@ -1535,6 +1546,9 @@ GPT: lwp %s had signal %s, but it is in *status = lp->status; } + if (*status == 0 && GET_PID (lp->ptid) == pid_was_stopped) + *status = W_STOPCODE (SIGSTOP); + return 0; } @@ -1631,6 +1645,8 @@ linux_nat_detach (struct target_ops *ops inferior_ptid = pid_to_ptid (pid); linux_ops->to_detach (ops, args, from_tty); + pid_was_stopped = 0; + if (target_can_async_p ()) drain_queued_events (pid); } @@ -1787,6 +1803,14 @@ linux_nat_resume (ptid_t ptid, int step_ resume_callback. */ lp->stopped = 0; + /* At this point, we are going to resume the inferior and if we + have attached to a stopped process, we no longer should leave + it as stopped if the user detaches. PTID variable has PID set to LWP + while we need to check the real PID here. */ + + if (!step && lp && pid_was_stopped == GET_PID (lp->ptid)) + pid_was_stopped = 0; + if (resume_all) iterate_over_lwps (resume_callback, NULL); @@ -3281,6 +3305,8 @@ linux_nat_mourn_inferior (struct target_ there are other viable forks to debug. Delete the exiting one and context-switch to the first available. */ linux_fork_mourn_inferior (); + + pid_was_stopped = 0; } static LONGEST Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-into-signal.c =================================================================== --- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.threads/attach-into-signal.c 2008-05-01 20:50:14.000000000 +0200 +++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-into-signal.c 2008-12-06 21:57:23.000000000 +0100 @@ -1,19 +1,20 @@ /* This testcase is part of GDB, the GNU debugger. - Copyright 2008 Free Software Foundation, Inc. + Copyright 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include @@ -40,8 +41,10 @@ static void *func (void *arg) raise (SIGALRM); - /* We must not get past this point, either in a free standing or debugged - state. */ + /* This should be NOTREACHED but sometimes it is reached - Bug 427860. + We never get here without ptrace(2). It may also be a kernel bug. */ + for (;;) + pause (); abort (); /* NOTREACHED */ Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-into-signal.exp =================================================================== --- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.threads/attach-into-signal.exp 2008-05-01 20:50:14.000000000 +0200 +++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-into-signal.exp 2008-12-06 21:57:23.000000000 +0100 @@ -1,27 +1,29 @@ -# Copyright 2008 -# Free Software Foundation, Inc. +# Copyright 2007 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # This test was created by modifying attach-stopped.exp. # This file was created by Jan Kratochvil . -# This test only works on Linux -if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { - continue +if $tracelevel then { + strace $tracelevel } +set prms_id 0 +set bug_id 0 + set testfile "attach-into-signal" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} @@ -60,6 +62,10 @@ proc corefunc { threadtype } { set attempt 1 set passes 1 while { $passes < 3 && $attempt <= $attempts } { + + # Start with clean gdb + gdb_exit + set stoppedtry 0 while { $stoppedtry < 10 } { if [catch {open /proc/${testpid}/status r} fileid] { @@ -83,10 +89,30 @@ proc corefunc { threadtype } { break } + gdb_start + gdb_reinitialize_dir $srcdir/$subdir + gdb_load ${binfile} + + # No PASS message as we may be looping in multiple attempts. + gdb_test "set debug lin-lwp 1" "" "" + + set test "$threadtype: set file (pass $passes), before attach1 to stopped process" + if {[gdb_test_multiple "file $binfile" $test { + -re "Load new symbol table from.*y or n. $" { + # No PASS message as we may be looping in multiple attempts. + gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." "" + } + -re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" { + # No PASS message as we may be looping in multiple attempts. + } + }] != 0 } { + break + } + # Main test: set test "$threadtype: attach (pass $passes), pending signal catch" if {[gdb_test_multiple "attach $testpid" $test { - -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*Received Alarm clock.*$gdb_prompt $" { + -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*Redelivering pending Alarm clock..*$gdb_prompt $" { # nonthreaded: pass $test verbose -log "$test succeeded on the attempt # $attempt of $attempts" @@ -97,7 +123,7 @@ proc corefunc { threadtype } { # We just lack the luck, we should try it again. set attempt [expr $attempt + 1] } - -re "Attaching to process $testpid.*Received Alarm clock.*$gdb_prompt $" { + -re "Attaching to process $testpid.*Redelivering pending Alarm clock..*$gdb_prompt $" { # threaded: pass $test verbose -log "$test succeeded on the attempt # $attempt of $attempts" @@ -111,8 +137,6 @@ proc corefunc { threadtype } { }] != 0 } { break } - - gdb_test "detach" "Detaching from.*" "" } if {$passes < 3} { if {$attempt > $attempts} { @@ -138,20 +162,12 @@ proc corefunc { threadtype } { remote_exec build "kill -9 ${testpid}" } -# Start with clean gdb -gdb_exit - # build the test case first without threads # if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { gdb_suppress_entire_file "Testcase nonthraded compile failed, so all tests in this file will automatically fail." } -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} -gdb_test "set debug lin-lwp 1" "" "" - corefunc nonthreaded # build the test case also with threads @@ -160,9 +176,4 @@ if { [gdb_compile_pthreads "${srcdir}/$ gdb_suppress_entire_file "Testcase threaded compile failed, so all tests in this file will automatically fail." } -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} -gdb_test "set debug lin-lwp 1" "" "" - corefunc threaded Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-stopped.c =================================================================== --- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.threads/attach-stopped.c 2008-05-01 20:50:14.000000000 +0200 +++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-stopped.c 2008-12-06 21:57:23.000000000 +0100 @@ -1,19 +1,20 @@ /* This testcase is part of GDB, the GNU debugger. - Copyright 2008 Free Software Foundation, Inc. + Copyright 2005-2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This program is intended to be started outside of gdb, then manually stopped via a signal. */ Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-stopped.exp =================================================================== --- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.threads/attach-stopped.exp 2008-05-01 20:50:14.000000000 +0200 +++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attach-stopped.exp 2008-12-06 21:57:23.000000000 +0100 @@ -1,26 +1,33 @@ -# Copyright 2008 -# Free Software Foundation, Inc. +# Copyright 2005-2007 # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # This test was created by modifying attach.exp. # This file was created by Jeff Johnston . # This file was updated by Jan Kratochvil . +if $tracelevel then { + strace $tracelevel +} + +set prms_id 0 +set bug_id 0 + # This test only works on Linux -if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { - continue +if { ![istarget "*-*-linux-gnu*"] } { + return 0 } set testfile "attach-stopped" @@ -63,7 +70,65 @@ proc corefunc { threadtype } { gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} - # Verify that we can attach to the stopped process. + # Verify that we can attach to the process by first giving its + # executable name via the file command, and using attach with the + # process ID. + + set test "$threadtype: set file, before attach1 to stopped process" + gdb_test_multiple "file $binfile" "$test" { + -re "Load new symbol table from.*y or n. $" { + gdb_test "y" "Reading symbols from $escapedbinfile\.\.\.*done." \ + "$test (re-read)" + } + -re "Reading symbols from $escapedbinfile\.\.\.*done.*$gdb_prompt $" { + pass "$test" + } + } + + set test "$threadtype: attach1 to stopped, after setting file" + gdb_test_multiple "attach $testpid" "$test" { + -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*$gdb_prompt $" { + pass "$test" + } + } + + # ".*sleep.*clone.*" would fail on s390x as bt stops at START_THREAD there. + if {[string equal $threadtype threaded]} { + gdb_test "thread apply all bt" ".*sleep.*start_thread.*" "$threadtype: attach1 to stopped bt" + } else { + gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach1 to stopped bt" + } + + # Exit and detach the process. + + gdb_exit + + # Avoid some race: + sleep 2 + + if [catch {open /proc/${testpid}/status r} fileid] { + set line2 "NOTFOUND" + } else { + gets $fileid line1; + gets $fileid line2; + close $fileid; + } + + set test "$threadtype: attach1, exit leaves process stopped" + if {[string match "*(stopped)*" $line2]} { + pass $test + } else { + fail $test + } + + # At this point, the process should still be stopped + + gdb_start + gdb_reinitialize_dir $srcdir/$subdir + gdb_load ${binfile} + + # Verify that we can attach to the process just by giving the + # process ID. set test "$threadtype: attach2 to stopped, after setting file" gdb_test_multiple "attach $testpid" "$test" { Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attachstop-mt.c =================================================================== --- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.threads/attachstop-mt.c 2008-05-01 20:50:14.000000000 +0200 +++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attachstop-mt.c 2008-12-06 21:57:23.000000000 +0100 @@ -1,19 +1,20 @@ /* This testcase is part of GDB, the GNU debugger. - Copyright 2008 Free Software Foundation, Inc. + Copyright 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or + the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This program is intended to be started outside of gdb, then manually stopped via a signal. */ Index: gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attachstop-mt.exp =================================================================== --- gdb-6.8.50.20081128.orig/gdb/testsuite/gdb.threads/attachstop-mt.exp 2008-09-28 13:39:45.000000000 +0200 +++ gdb-6.8.50.20081128/gdb/testsuite/gdb.threads/attachstop-mt.exp 2008-12-06 21:57:23.000000000 +0100 @@ -176,12 +176,23 @@ gdb_test "bt" ".*sleep.*(func|main).*" " # Exit and detach the process. gdb_exit -# Stop the program -remote_exec build "kill -s STOP ${testpid}" - # No race sleep 2 +set fileid3 [open $status2 r]; +gets $fileid3 line1; +gets $fileid3 line2; +close $fileid3; + +set test "attach3, exit leaves process stopped" +if {[string match "*(stopped)*" $line2]} { + pass $test +} else { + fail $test +} + +# At this point, the process should still be stopped + # Continue the test as we would hit another expected bug regarding # Program received signal SIGSTOP, Stopped (signal). # across NPTL threads.