From: Tom de Vries <tdevries@suse.de>
To: Pedro Alves <pedro@palves.net>,
gdb-patches@sourceware.org, Tom Tromey <tom@tromey.com>
Subject: Re: [PATCH 2/2] [gdb] Initialize main_thread_id earlier
Date: Wed, 2 Aug 2023 16:45:27 +0200 [thread overview]
Message-ID: <56672463-0c3a-261f-8199-4d944f91cbed@suse.de> (raw)
In-Reply-To: <591a3e4a-ac32-805b-75e4-c378ef641bdd@palves.net>
[-- Attachment #1: Type: text/plain, Size: 1908 bytes --]
On 7/28/23 17:36, Pedro Alves wrote:
> On 2023-07-28 11:59, Tom de Vries via Gdb-patches wrote:
>> 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 ();
>
Hi Pedro,
thanks for the review.
> This is assuming that is_main_thread() will always be called once by
> the main thread, before any other thread could call it. Otherwise if
> is_main_thread is called by some other thread first,
> is_main_thread -> initialize_main_thread_id will record the wrong thread
> id in the main_thread_id. At least a comment somewhere would
> be warranted. I think putting:
>
> gdb_assert (is_main_thread ());
>
> somewhere in the early main code would be good. It would prevent such
> situation from ever happening undetected.
>
Updated accordingly. Any further comments?
Thanks,
- Tom
[-- Attachment #2: 0001-gdb-Initialize-main_thread_id-earlier.patch --]
[-- Type: text/x-patch, Size: 2775 bytes --]
From 3886892551c9e35b6ea36a6df23167fa3690a319 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Fri, 28 Jul 2023 11:41:07 +0200
Subject: [PATCH] [gdb] Initialize main_thread_id earlier
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 initializing, either:
- when entering main, or
- on an earlier first use.
Tested on x86_64-linux.
---
gdb/gdb.c | 7 +++++++
gdb/run-on-main-thread.c | 24 +++++++++++++++++++++++-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/gdb/gdb.c b/gdb/gdb.c
index 71a3fd12ba1..6e3ff0755ab 100644
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -19,10 +19,17 @@
#include "defs.h"
#include "main.h"
#include "interps.h"
+#include "run-on-main-thread.h"
int
main (int argc, char **argv)
{
+ /* The first call to is_main_thread () should be from the main thread.
+ If this is the first call, then that requirement is fulfilled here.
+ If this is not the first call, then this verifies that the first call
+ fulfilled that requirement. */
+ gdb_assert (is_main_thread ());
+
struct captured_main_args args;
memset (&args, 0, sizeof args);
diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
index 91d25dae28f..5d453ffe612 100644
--- a/gdb/run-on-main-thread.c
+++ b/gdb/run-on-main-thread.c
@@ -94,12 +94,29 @@ run_on_main_thread (std::function<void ()> &&func)
serial_event_set (runnable_event);
}
+#if CXX_STD_THREAD
+static bool main_thread_id_initialized = false;
+
+static void
+initialize_main_thread_id ()
+{
+ if ( main_thread_id_initialized)
+ return;
+ main_thread_id_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 on first use of is_main_thread. */
+ initialize_main_thread_id ();
+
return std::this_thread::get_id () == main_thread_id;
#else
return true;
@@ -111,7 +128,12 @@ void
_initialize_run_on_main_thread ()
{
#if CXX_STD_THREAD
- main_thread_id = std::this_thread::get_id ();
+ /* The variable main_thread_id should be initialized when entering main, or
+ at an earlier use, so it should already be initialized here. */
+ gdb_assert (main_thread_id_initialized);
+
+ /* Assume that we execute this in the main thread. */
+ gdb_assert (is_main_thread ());
#endif
runnable_event = make_serial_event ();
add_file_handler (serial_event_fd (runnable_event), run_events, nullptr,
base-commit: b5c37946cce4b41af0436529b139fa3d23e61f73
--
2.35.3
next prev parent reply other threads:[~2023-08-02 14:45 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 ` [PATCH 2/2] [gdb] Initialize main_thread_id earlier Tom de Vries
2023-07-28 13:10 ` 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 [this message]
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=56672463-0c3a-261f-8199-4d944f91cbed@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.org \
--cc=pedro@palves.net \
--cc=tom@tromey.com \
/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).