From: Andrew Burgess <aburgess@redhat.com>
To: gdb-patches@sourceware.org
Cc: Andrew Burgess <aburgess@redhat.com>
Subject: [PATCHv2 2/6] gdb: hoist target_async_permitted checks into target.c
Date: Wed, 24 Nov 2021 12:22:05 +0000 [thread overview]
Message-ID: <fc3156afb9bccf6ee96a1eca0403cad480f368d0.1637756330.git.aburgess@redhat.com> (raw)
In-Reply-To: <cover.1637756330.git.aburgess@redhat.com>
This commit moves the target_async_permitted check out of each targets
::can_async_p method and into the two target_can_async_p wrapper
functions.
I've left some asserts in the two ::can_async_p methods that I
changed, which will hopefully catch any direct calls to these methods
that might be added in the future.
There should be no user visible changes after this commit.
---
gdb/linux-nat.c | 5 ++++-
gdb/remote.c | 11 ++++-------
gdb/target.c | 4 ++++
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index f8f728481ea..3e1d1644d4c 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4088,9 +4088,12 @@ linux_nat_target::is_async_p ()
bool
linux_nat_target::can_async_p ()
{
+ /* This flag should be checked in the common target.c code. */
+ gdb_assert (target_async_permitted);
+
/* We're always async, unless the user explicitly prevented it with the
"maint set target-async" command. */
- return target_async_permitted;
+ return true;
}
bool
diff --git a/gdb/remote.c b/gdb/remote.c
index 724386e0916..6ecea5b7fd7 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -14379,14 +14379,11 @@ remote_target::thread_info_to_thread_handle (struct thread_info *tp)
bool
remote_target::can_async_p ()
{
- struct remote_state *rs = get_remote_state ();
-
- /* We don't go async if the user has explicitly prevented it with the
- "maint set target-async" command. */
- if (!target_async_permitted)
- return false;
+ /* This flag should be checked in the common target.c code. */
+ gdb_assert (target_async_permitted);
- /* We're async whenever the serial device is. */
+ /* We're async whenever the serial device can. */
+ struct remote_state *rs = get_remote_state ();
return serial_can_async_p (rs->remote_desc);
}
diff --git a/gdb/target.c b/gdb/target.c
index c5276ae0fe7..d693b670350 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -391,6 +391,8 @@ target_can_lock_scheduler ()
bool
target_can_async_p ()
{
+ if (!target_async_permitted)
+ return false;
return current_inferior ()->top_target ()->can_async_p ();
}
@@ -399,6 +401,8 @@ target_can_async_p ()
bool
target_can_async_p (struct target_ops *target)
{
+ if (!target_async_permitted)
+ return false;
return target->can_async_p ();
}
--
2.25.4
next prev parent reply other threads:[~2021-11-24 12:22 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-23 14:08 [PATCH 0/4] Improve 'maint set target-async off' for remote targets Andrew Burgess
2021-11-23 14:08 ` [PATCH 1/4] gdb: add asserts in target.c for target_async_permitted Andrew Burgess
2021-11-23 21:31 ` Simon Marchi
2021-11-23 14:08 ` [PATCH 2/4] gdb/remote: merge ::is_async_p and ::can_async_p methods Andrew Burgess
2021-11-23 21:33 ` Simon Marchi
2021-11-24 10:14 ` Andrew Burgess
2021-11-23 14:08 ` [PATCH 3/4] gdb: add assert in remote_target::wait relating to async being off Andrew Burgess
2021-11-23 21:50 ` Simon Marchi
2021-11-23 14:08 ` [PATCH 4/4] gdb/remote: some fixes for 'maint set target-async off' Andrew Burgess
2021-11-23 22:03 ` Simon Marchi
2021-11-23 16:39 ` [PATCH 0/4] Improve 'maint set target-async off' for remote targets John Baldwin
2021-11-24 12:22 ` [PATCHv2 0/6] " Andrew Burgess
2021-11-24 12:22 ` [PATCHv2 1/6] gdb: introduce a new overload of target_can_async_p Andrew Burgess
2021-11-24 12:22 ` Andrew Burgess [this message]
2021-11-24 21:17 ` [PATCHv2 2/6] gdb: hoist target_async_permitted checks into target.c Simon Marchi
2021-11-24 12:22 ` [PATCHv2 3/6] gdb: add asserts in target.c for target_async_permitted Andrew Burgess
2021-11-24 21:21 ` Simon Marchi
2021-11-24 12:22 ` [PATCHv2 4/6] gdb: simplify remote_target::is_async_p Andrew Burgess
2021-11-24 12:22 ` [PATCHv2 5/6] gdb: add assert in remote_target::wait relating to async being off Andrew Burgess
2021-11-24 21:23 ` Simon Marchi
2021-11-25 10:04 ` Andrew Burgess
2021-11-25 11:36 ` Tom de Vries
2021-11-25 13:46 ` Andrew Burgess
2021-11-25 14:17 ` Tom de Vries
2021-11-24 12:22 ` [PATCHv2 6/6] gdb/remote: some fixes for 'maint set target-async off' Andrew Burgess
2021-12-01 10:40 ` [PATCHv3 0/2] Improve 'maint set target-async off' for remote targets Andrew Burgess
2021-12-01 10:40 ` [PATCHv3 1/2] gdb/remote: some fixes for 'maint set target-async off' Andrew Burgess
2021-12-16 21:15 ` Pedro Alves
2021-12-17 13:35 ` Andrew Burgess
2021-12-17 14:05 ` Pedro Alves
2021-12-18 10:21 ` Andrew Burgess
2021-12-01 10:40 ` [PATCHv3 2/2] gdb: add assert in remote_target::wait relating to async being off Andrew Burgess
2021-12-16 21:16 ` Pedro Alves
2021-12-18 10:21 ` Andrew Burgess
2021-12-13 11:41 ` PING: [PATCHv3 0/2] Improve 'maint set target-async off' for remote targets Andrew Burgess
2021-12-13 17:20 ` John Baldwin
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=fc3156afb9bccf6ee96a1eca0403cad480f368d0.1637756330.git.aburgess@redhat.com \
--to=aburgess@redhat.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).