From patchwork Sun Nov 12 20:25:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79673 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 63EBE3858419 for ; Sun, 12 Nov 2023 20:27:26 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta40.uswest2.a.cloudfilter.net (omta40.uswest2.a.cloudfilter.net [35.89.44.39]) by sourceware.org (Postfix) with ESMTPS id EA33E3858C01 for ; Sun, 12 Nov 2023 20:25:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EA33E3858C01 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EA33E3858C01 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699820741; cv=none; b=u2TxTWH6NtBmPjMb+FsDIOR/HYaD0TDqq6s1Z97LUYE218ZE5aknZknRKz1KlVTvU3WGdLbRp4WEqYKjOZ/+yrL1kRjJM0GvMxF0DnG81Ewbbtxh1ArWyC4BUgmCS8dUgLmsMwz9g+Nh6/FIYQ96ctxRPHR5hSb//wErnm4StTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699820741; c=relaxed/simple; bh=GXaRAAMF4MUtVXlizMO+lB+IwIOGlpJz08YKsaD7Akg=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=gBnZQ1aZeIGxX7hPN+kwqgTR0ol2Ay08NW5zGCfPiveZIkYoRFA0ilcT9Mt43BOtXyj8kU0zPKIwqKcDtATkDmcJUQfPF0xf8v9Q6qCLiOe5B+yABOhgZu3TG3Ib/svXL0lMbOx8HOq3geRXoBiOj4GWN+Mx1ndBdA3iU8nfK6w= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6010a.ext.cloudfilter.net ([10.0.30.248]) by cmsmtp with ESMTPS id 2GcpruyXGL9Ag2H1TrVwdZ; Sun, 12 Nov 2023 20:25:35 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 2H1RrIPTd8vT02H1SrTipe; Sun, 12 Nov 2023 20:25:34 +0000 X-Authority-Analysis: v=2.4 cv=ffi+dmcF c=1 sm=1 tr=0 ts=655134be a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10 a=BNY50KLci1gA:10 a=Qbun_eYptAEA:10 a=bPD8YYKBUqYfeLPULJ0A:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=OnNFvbIhA6sf2euGr8FhYCMgL1g30KA+jOVdszqeCio=; b=aRc0VocE9ICPtDhGO9tLjvsNHo Kv83vKJgNKpQEWZrVRBfo+A81ULC658iYOD57P+/kg3Ih1OnHkNAz8LQh/XZvaJViAd+pmBbmk8/N gltqsGXBl+2BoiHMFpftzcwsU; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:34540 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1r2H1R-000cUU-2U for gdb-patches@sourceware.org; Sun, 12 Nov 2023 13:25:33 -0700 From: Tom Tromey Date: Sun, 12 Nov 2023 13:25:52 -0700 Subject: [PATCH v2 15/18] Lazy language setting MIME-Version: 1.0 Message-Id: <20231112-t-bg-dwarf-reading-v2-15-70fb170012ba@tromey.com> References: <20231112-t-bg-dwarf-reading-v2-0-70fb170012ba@tromey.com> In-Reply-To: <20231112-t-bg-dwarf-reading-v2-0-70fb170012ba@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.77.73 X-Source-L: No X-Exim-ID: 1r2H1R-000cUU-2U X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-77-73.hlrn.qwest.net ([192.168.0.21]) [97.122.77.73]:34540 X-Source-Auth: tom+tromey.com X-Email-Count: 16 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfAQ18xKqQP94DzJqZ8qFXO2BYjELvnyPQW+n9LAWWla9oFVC2igRelij41kYVoVXAL6Tk28iOCyEoZD/xKsizJff67bZmRqBdpqDvY9tf6IDOzQj6dDh 8oe46jKwbzbczBIiGhP/JLgrRRbaDrlsnv3OlNPGzfjmnVR5/yKfhv4Oi6RpZQazqmIhZDfpHNeOYUcn7OdfRhNtl+bWInzKofw= X-Spam-Status: No, score=-3024.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_MSPIKE_H2, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org When gdb starts up with a symbol file, it uses the program's "main" to decide the "static context" and the initial language. With background DWARF reading, this means that gdb has to wait for a significant amount of DWARF to be read synchronously. This patch introduces lazy language setting. The idea here is that in many cases, the prompt can show up early, making gdb feel more responsive. --- gdb/gdbthread.h | 3 ++- gdb/language.c | 35 +++++++++++++++++++++++++++++++++++ gdb/language.h | 27 ++++++++++++++++++++------- gdb/symfile.c | 18 +++++++++++++----- gdb/thread.c | 8 +++----- 5 files changed, 73 insertions(+), 18 deletions(-) diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 48f32bb3a0b..ed00cbcf32e 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -35,6 +35,7 @@ struct symtab; #include "displaced-stepping.h" #include "gdbsupport/intrusive_list.h" #include "thread-fsm.h" +#include "language.h" struct inferior; struct process_stratum_target; @@ -888,7 +889,7 @@ class scoped_restore_current_thread /* Save/restore the language as well, because selecting a frame changes the current language to the frame's language if "set language auto". */ - enum language m_lang; + scoped_restore_current_language m_lang; }; /* Returns a pointer into the thread_info corresponding to diff --git a/gdb/language.c b/gdb/language.c index d38e2c04afb..acb11a74486 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -80,6 +80,7 @@ enum case_sensitivity case_sensitivity = case_sensitive_on; /* The current language and language_mode (see language.h). */ static const struct language_defn *global_current_language; +static lazily_set_language_ftype *lazy_language_setter; enum language_mode language_mode = language_mode_auto; /* See language.h. */ @@ -87,9 +88,41 @@ enum language_mode language_mode = language_mode_auto; const struct language_defn * get_current_language () { + if (lazy_language_setter != nullptr) + { + /* Avoid recursive calls -- set_language refers to + current_language. */ + lazily_set_language_ftype *call = lazy_language_setter; + lazy_language_setter = nullptr; + call (); + } return global_current_language; } +void +lazily_set_language (lazily_set_language_ftype *fun) +{ + lazy_language_setter = fun; +} + +scoped_restore_current_language::scoped_restore_current_language () + : m_lang (global_current_language), + m_fun (lazy_language_setter) +{ +} + +scoped_restore_current_language::~scoped_restore_current_language () +{ + /* If both are NULL, then that means dont_restore was called. */ + if (m_lang != nullptr || m_fun != nullptr) + { + global_current_language = m_lang; + lazy_language_setter = m_fun; + if (lazy_language_setter == nullptr) + set_range_case (); + } +} + /* The language that the user expects to be typing in (the language of main(), or the last language we notified them about, or C). */ @@ -185,6 +218,7 @@ set_language (const char *language) /* Found it! Go into manual mode, and use this language. */ language_mode = language_mode_manual; + lazy_language_setter = nullptr; global_current_language = lang; set_range_case (); expected_language = lang; @@ -372,6 +406,7 @@ set_range_case (void) void set_language (enum language lang) { + lazy_language_setter = nullptr; global_current_language = language_def (lang); set_range_case (); } diff --git a/gdb/language.h b/gdb/language.h index 6ff6f5eb95f..6cbcd119dac 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -787,6 +787,10 @@ extern void language_info (); extern void set_language (enum language lang); +typedef void lazily_set_language_ftype (); +extern void lazily_set_language (lazily_set_language_ftype *fun); + + /* Test a character to decide whether it can be printed in literal form or needs to be printed in another representation. For example, in C the literal form of the character with octal value 141 is 'a' @@ -837,14 +841,14 @@ class scoped_restore_current_language { public: - explicit scoped_restore_current_language () - : m_lang (current_language->la_language) - { - } + scoped_restore_current_language (); + ~scoped_restore_current_language (); - ~scoped_restore_current_language () + scoped_restore_current_language (scoped_restore_current_language &&other) { - set_language (m_lang); + m_lang = other.m_lang; + m_fun = other.m_fun; + other.dont_restore (); } scoped_restore_current_language (const scoped_restore_current_language &) @@ -852,9 +856,18 @@ class scoped_restore_current_language scoped_restore_current_language &operator= (const scoped_restore_current_language &) = delete; + /* Cancel restoring on scope exit. */ + void dont_restore () + { + /* This is implemented using a sentinel value. */ + m_lang = nullptr; + m_fun = nullptr; + } + private: - enum language m_lang; + const language_defn *m_lang; + lazily_set_language_ftype *m_fun; }; /* If language_mode is language_mode_auto, diff --git a/gdb/symfile.c b/gdb/symfile.c index a89876c6835..7b45343b5de 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1683,13 +1683,11 @@ symbol_file_command (const char *args, int from_tty) } } -/* Set the initial language. */ +/* Lazily set the initial language. */ -void -set_initial_language (void) +static void +set_initial_language_callback () { - if (language_mode == language_mode_manual) - return; enum language lang = main_language (); /* Make C the default language. */ enum language default_lang = language_c; @@ -1714,6 +1712,16 @@ set_initial_language (void) expected_language = current_language; /* Don't warn the user. */ } +/* Set the initial language. */ + +void +set_initial_language (void) +{ + if (language_mode == language_mode_manual) + return; + lazily_set_language (set_initial_language_callback); +} + /* Open the file specified by NAME and hand it off to BFD for preliminary analysis. Return a newly initialized bfd *, which includes a newly malloc'd` copy of NAME (tilde-expanded and made diff --git a/gdb/thread.c b/gdb/thread.c index 0660589abbf..04aac1caf13 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -1405,13 +1405,13 @@ scoped_restore_current_thread::restore () && target_has_stack () && target_has_memory ()) restore_selected_frame (m_selected_frame_id, m_selected_frame_level); - - set_language (m_lang); } scoped_restore_current_thread::~scoped_restore_current_thread () { - if (!m_dont_restore) + if (m_dont_restore) + m_lang.dont_restore (); + else restore (); } @@ -1419,8 +1419,6 @@ scoped_restore_current_thread::scoped_restore_current_thread () { m_inf = inferior_ref::new_reference (current_inferior ()); - m_lang = current_language->la_language; - if (inferior_ptid != null_ptid) { m_thread = thread_info_ref::new_reference (inferior_thread ());