From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH 2/2] [gdb] Initialize main_thread_id earlier
Date: Fri, 28 Jul 2023 12:59:45 +0200 [thread overview]
Message-ID: <20230728105945.13909-2-tdevries@suse.de> (raw)
In-Reply-To: <20230728105945.13909-1-tdevries@suse.de>
I wrote a patch using is_main_thread (), and found it returning false in the
main thread due to main_thread_id not being initialized yet.
Initialization currently takes place in _initialize_run_on_main_thread, but
that's too late for earlier uses.
Fix this by also initializing on first use.
Tested on x86_64-linux.
---
gdb/run-on-main-thread.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
index 91d25dae28f..bee5885d9a6 100644
--- a/gdb/run-on-main-thread.c
+++ b/gdb/run-on-main-thread.c
@@ -94,12 +94,27 @@ run_on_main_thread (std::function<void ()> &&func)
serial_event_set (runnable_event);
}
+#if CXX_STD_THREAD
+static void
+initialize_main_thread_id (void)
+{
+ static bool initialized = false;
+
+ if (initialized)
+ return;
+ initialized = true;
+
+ main_thread_id = std::this_thread::get_id ();
+}
+#endif
+
/* See run-on-main-thread.h. */
bool
is_main_thread ()
{
#if CXX_STD_THREAD
+ initialize_main_thread_id ();
return std::this_thread::get_id () == main_thread_id;
#else
return true;
@@ -111,7 +126,7 @@ void
_initialize_run_on_main_thread ()
{
#if CXX_STD_THREAD
- main_thread_id = std::this_thread::get_id ();
+ initialize_main_thread_id ();
#endif
runnable_event = make_serial_event ();
add_file_handler (serial_event_fd (runnable_event), run_events, nullptr,
--
2.35.3
next prev parent reply other threads:[~2023-07-28 11:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 10:59 [PATCH 1/2] [gdb] Rename variable main_thread to main_thread_id Tom de Vries
2023-07-28 10:59 ` Tom de Vries [this message]
2023-07-28 13:10 ` [PATCH 2/2] [gdb] Initialize main_thread_id earlier Tom Tromey
2023-08-02 14:26 ` Tom de Vries
2023-08-02 16:55 ` Tom Tromey
2023-08-02 18:46 ` Tom de Vries
2023-08-02 20:48 ` Tom Tromey
2023-08-02 21:21 ` Tom de Vries
2023-07-28 15:36 ` Pedro Alves
2023-08-02 14:45 ` Tom de Vries
2023-07-28 13:06 ` [PATCH 1/2] [gdb] Rename variable main_thread to main_thread_id Tom Tromey
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=20230728105945.13909-2-tdevries@suse.de \
--to=tdevries@suse.de \
--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).