From: Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v2] gdb: restore thread after detaching or killing an inferior
Date: Wed, 28 Oct 2020 18:12:19 +0100 [thread overview]
Message-ID: <1603905139-28858-1-git-send-email-tankut.baris.aktemur@intel.com> (raw)
In-Reply-To: <1602000337-24945-1-git-send-email-tankut.baris.aktemur@intel.com>
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 [<null>] (<noexec>)]
(gdb) info inferiors
Num Description Connection Executable
1 process 18242 1 (native) /path/to/a.out
* 2 <null> 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 <null> /path/to/a.out
2 <null> 1 (native)
(gdb)
The same switch happens with the "kill inferiors N" command. Prevent
it by restoring the current thread.
gdb/ChangeLog:
2020-10-06 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
PR gdb/19318
* inferior.c (detach_inferior_command): Restore the current thread.
(kill_inferior_command): Ditto.
gdb/testsuite/ChangeLog:
2020-10-06 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
* gdb.base/kill-detach-inferiors-cmd.exp: Check that 'kill
inferiors' and 'detach inferiors' do not change the current
inferior.
---
gdb/inferior.c | 4 ++++
gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp | 2 ++
2 files changed, 6 insertions(+)
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/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.17.1
next prev parent reply other threads:[~2020-10-28 17:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 16:05 [PATCH] gdb: restore thread after detaching from " Tankut Baris Aktemur
2020-10-21 6:58 ` Aktemur, Tankut Baris
2020-10-22 15:35 ` Pedro Alves
2020-10-28 17:11 ` Aktemur, Tankut Baris
2020-10-28 17:12 ` Tankut Baris Aktemur [this message]
2020-10-29 14:26 ` [PATCH v2] gdb: restore thread after detaching or killing " Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1603905139-28858-1-git-send-email-tankut.baris.aktemur@intel.com \
--to=tankut.baris.aktemur@intel.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).