From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 2326D3858CDA for ; Fri, 28 Jul 2023 11:00:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2326D3858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1189A219C9 for ; Fri, 28 Jul 2023 11:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690542002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p8SXWsjnbCHiDI3Yw4yZ5/L5USt6hOxXNGMh9NXmnqg=; b=q086poAS10wkq96wKl1c0RnEumRMOpj2MvXCj75yxgK3Z6xp9v2/RzGsFjk1L6L5PpnLNr MtFIDrQPGYTLpchrGClMV5Za9iogXzWSmupflARzr1k6RSfoSy1OFjPDyuAWFH7rlmgnCS UvQSxeAwlPGW5y9lsP1iJJPNyv1yG7U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690542002; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p8SXWsjnbCHiDI3Yw4yZ5/L5USt6hOxXNGMh9NXmnqg=; b=ym4685dFpTRgXGlDE0Lxz/hQrR8uZZacvIpoKt2IP4WcXEOoQMewto/IycWEfy5xxwaxWR uDQg6jy4U7yPFxBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id F1C89139BD for ; Fri, 28 Jul 2023 11:00:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id UE0FOrGfw2QoOQAAMHmgww (envelope-from ) for ; Fri, 28 Jul 2023 11:00:01 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/2] [gdb] Initialize main_thread_id earlier Date: Fri, 28 Jul 2023 12:59:45 +0200 Message-Id: <20230728105945.13909-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230728105945.13909-1-tdevries@suse.de> References: <20230728105945.13909-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 &&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