diff options
| -rw-r--r-- | gdb/target.c | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/run-control-while-bg-execution.c | 33 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/run-control-while-bg-execution.exp | 122 |
3 files changed, 164 insertions, 0 deletions
diff --git a/gdb/target.c b/gdb/target.c index 0c86b571e1c..0eae5307785 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -908,6 +908,15 @@ add_deprecated_target_alias (const target_info &tinfo, const char *alias) void target_kill (void) { + + /* If the commit_resume_state of the to-be-killed-inferior's process stratum + is true, and this inferior is the last live inferior with resumed threads + of that target, then we want to leave commit_resume_state to false, as the + target won't have any resumed threads anymore. We achieve this with + this scoped_disable_commit_resumed. On construction, it will set the flag + to false. On destruction, it will only set it to true if there are resumed + threads left. */ + scoped_disable_commit_resumed disable ("killing"); current_inferior ()->top_target ()->kill (); } diff --git a/gdb/testsuite/gdb.base/run-control-while-bg-execution.c b/gdb/testsuite/gdb.base/run-control-while-bg-execution.c new file mode 100644 index 00000000000..8092fadc8b9 --- /dev/null +++ b/gdb/testsuite/gdb.base/run-control-while-bg-execution.c @@ -0,0 +1,33 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020-2022 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 + (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 <http://www.gnu.org/licenses/>. */ + // +#include <unistd.h> + +static pid_t mypid = -1; + +static void +after_getpid (void) +{ +} + +int +main (void) +{ + mypid = getpid (); + after_getpid (); + sleep (30); +} diff --git a/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp b/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp new file mode 100644 index 00000000000..5b4834f0b32 --- /dev/null +++ b/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp @@ -0,0 +1,122 @@ +# Copyright 2022 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 +# (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 <http://www.gnu.org/licenses/>. + +# This test aims at testing various operations after getting rid of an inferior +# that was running in background, or while we have an inferior running in +# background. The original intent was to expose cases where the commit-resumed +# state of the process stratum target was not reset properly after killing an +# inferior running in background, which would be a problem when trying to run +# again. The test was expanded to test various combinations of +# run-control-related actions done with an inferior running in background. + +if {[use_gdb_stub]} { + unsupported "test requires running" + return +} + +standard_testfile + +if {[build_executable "failed to prepare" $testfile $srcfile]} { + return +} + +# Run one variation of the test: +# +# 1. Start an inferior in the background with "run &" +# 2. Do action 1 +# 3. Do action 2 +# +# Action 1 indicates what to do with the inferior running in background: +# +# - kill: kill it +# - detach: detach it +# - add: add a new inferior and switch to it, leave the inferior running in +# background alone +# - none: do nothing, leave the inferior running in background alone +# +# Action 2 indicates what to do after that: +# +# - start: use the start command +# - run: use the run command +# - attach: start a process outside of GDB and attach it +proc do_test { action1 action2 } { + save_vars { ::GDBFLAGS } { + append ::GDBFLAGS " -ex \"maintenance set target-non-stop on\"" + clean_restart $::binfile + } + + # Ensure we are at least after the getpid call, should we need it. + if { ![runto "after_getpid"] } { + return + } + + # Some commands below ask for confirmation. Turn that off for simplicity. + gdb_test "set confirm off" + gdb_test_multiple "continue &" "" { + -re ".*\r\n$::gdb_prompt " { + pass $gdb_test_name + } + } + + if { $action1 == "kill" } { + gdb_test "kill" "Inferior 1 .* killed.*" + } elseif { $action1 == "detach" } { + set child_pid [get_integer_valueof "mypid" -1] + if { $child_pid == -1 } { + fail "failed to extract child pid" + return + } + + gdb_test "detach" "Inferior 1 .* detached.*" "detach from first instance" + + # Kill the detached process, to avoid hanging when exiting GDBserver, + # when testing with the native-extended-gdbserver board. + remote_exec target "kill $child_pid" + } elseif { $action1 == "add" } { + gdb_test "add-inferior -exec $::binfile" \ + "Added inferior 2 on connection 1.*" "add-inferior" + gdb_test "inferior 2" "Switching to inferior 2 .*" + } elseif { $action1 == "none" } { + + } else { + error "invalid action 1" + } + + if { $action2 == "start" } { + gdb_test "start" "Temporary breakpoint $::decimal\(?:\.$::decimal\)?, main .*" + } elseif { $action2 == "run" } { + gdb_test "break main" "Breakpoint $::decimal at $::hex.*" + gdb_test "run" "Breakpoint $::decimal\(?:\.$::decimal\)?, main .*" + } elseif { $action2 == "attach" } { + set test_spawn_id [spawn_wait_for_attach $::binfile] + set test_pid [spawn_id_get_pid $test_spawn_id] + + if { [gdb_attach $test_pid] } { + gdb_test "detach" "Inferior $::decimal .* detached.*" \ + "detach from second instance" + } + + # Detach and kill this inferior so we don't leave it around. + kill_wait_spawned_process $test_spawn_id + } else { + error "invalid action 2" + } +} + +foreach_with_prefix action1 { kill detach add none } { + foreach_with_prefix action2 { start run attach } { + do_test $action1 $action2 + } +} |