From cfaa8f76928803afda1e1862bcd0ab5f7febd647 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Thu, 29 Oct 2020 15:33:39 +0100 Subject: [PATCH] gdb: restore thread after detaching or killing an inferior The "detach inferiors N" command causes the current inferior to switch. E.g.: $ gdb a.out Reading symbols from a.out... (gdb) start ... (gdb) add-inferior [New inferior 2] Added inferior 2 on connection 1 (native) (gdb) inferior 2 [Switching to inferior 2 [] ()] (gdb) info inferiors Num Description Connection Executable 1 process 18242 1 (native) /path/to/a.out * 2 1 (native) (gdb) detach inferiors 1 Detaching from program: /path/to/a.out, process 18242 [Inferior 1 (process 18242) detached] (gdb) info inferiors Num Description Connection Executable * 1 /path/to/a.out 2 1 (native) (gdb) The same switch happens with the "kill inferiors N" command. Prevent it by restoring the current thread. gdb/ChangeLog: 2020-10-29 Tankut Baris Aktemur PR gdb/19318 * inferior.c (detach_inferior_command): Restore the current thread. (kill_inferior_command): Ditto. gdb/testsuite/ChangeLog: 2020-10-29 Tankut Baris Aktemur * gdb.base/kill-detach-inferiors-cmd.exp: Check that 'kill inferiors' and 'detach inferiors' do not change the current inferior. --- gdb/ChangeLog | 6 ++++++ gdb/inferior.c | 4 ++++ gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp | 2 ++ 4 files changed, 18 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9dd5c0b6b22..3cef0093300 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-10-29 Tankut Baris Aktemur + + PR gdb/19318 + * inferior.c (detach_inferior_command): Restore the current thread. + (kill_inferior_command): Ditto. + 2020-10-28 Tom de Vries PR symtab/26772 diff --git a/gdb/inferior.c b/gdb/inferior.c index f775938721d..f06c13bbca4 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -547,6 +547,8 @@ detach_inferior_command (const char *args, int from_tty) if (!args || !*args) error (_("Requires argument (inferior id(s) to detach)")); + scoped_restore_current_thread restore_thread; + number_or_range_parser parser (args); while (!parser.finished ()) { @@ -584,6 +586,8 @@ kill_inferior_command (const char *args, int from_tty) if (!args || !*args) error (_("Requires argument (inferior id(s) to kill)")); + scoped_restore_current_thread restore_thread; + number_or_range_parser parser (args); while (!parser.finished ()) { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 24bc0d82c47..0c162bc3d8c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-10-29 Tankut Baris Aktemur + + * gdb.base/kill-detach-inferiors-cmd.exp: Check that 'kill + inferiors' and 'detach inferiors' do not change the current + inferior. + 2020-10-29 Tom de Vries * gdb.threads/tls.exp: Fix DUPLICATEs. diff --git a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp index 82e0c712c8f..06887601de4 100644 --- a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp +++ b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp @@ -46,9 +46,11 @@ gdb_test "attach $test_pid" "Attaching to process.*" "attach to pid" # Kill the first two inferiors, and detach the third. gdb_test_no_output "kill inferiors 1 2" +gdb_test "info inferiors 3" "\r\n\\* 3 \[^\r\n\]+" "inf 3 is still current" gdb_test "inferior 1" "Switching to inferior 1.*" gdb_test "kill" "The program is not being run.*" gdb_test "detach inferiors 3" "Detaching from program.*process $test_pid.*" +gdb_test "info inferiors 1" "\r\n\\* 1 \[^\r\n\]+" "inf 1 is still current" # No inferiors should be running anymore. gdb_test "kill inferiors 1 2 3" \ -- 2.30.2