From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 2AA9F3858C54 for ; Thu, 2 Mar 2023 20:32:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2AA9F3858C54 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com Received: from smarchi-efficios.internal.efficios.com (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id AEB351E223; Thu, 2 Mar 2023 15:32:25 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/3] gdb: make interp::m_name an `const char *` Date: Thu, 2 Mar 2023 15:32:23 -0500 Message-Id: <20230302203224.118345-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230302203224.118345-1-simon.marchi@efficios.com> References: <20230302203224.118345-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3497.5 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP 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: From: Simon Marchi I realized that the memory for interp names does not need to be allocated. The name used to register interp factory functions is always a literal string, so has static storage duration. If we change interp_lookup to pass that name instead of the string that it receives as a parameter (which does not always have static storage duration), then interps can simply store pointers to the name. So, change interp_lookup to pass `factory.name` rather than `name`. Change interp::m_name to be a `const char *` rather than an std::string. Change-Id: I0474d1f7b3512e7d172ccd73018aea927def3188 --- gdb/interps.c | 8 +++----- gdb/interps.h | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index 9517e57540d3..5b964aebbbd6 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -79,13 +79,11 @@ static struct interp *interp_lookup_existing (struct ui *ui, const char *name); interp::interp (const char *name) - : m_name (make_unique_xstrdup (name)) + : m_name (name) { } -interp::~interp () -{ -} +interp::~interp () = default; /* An interpreter factory. Maps an interpreter name to the factory function that instantiates an interpreter by that name. */ @@ -232,7 +230,7 @@ interp_lookup (struct ui *ui, const char *name) for (const interp_factory &factory : interpreter_factories) if (strcmp (factory.name, name) == 0) { - interp = factory.func (name); + interp = factory.func (factory.name); interp_add (ui, interp); return interp; } diff --git a/gdb/interps.h b/gdb/interps.h index 01bec47550dd..62f37951ddea 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -32,7 +32,9 @@ typedef struct interp *(*interp_factory_func) (const char *name); /* Each interpreter kind (CLI, MI, etc.) registers itself with a call to this function, passing along its name, and a pointer to a function that creates a new instance of an interpreter with that - name. */ + name. + + The memory for NAME must have static storage duration. */ extern void interp_factory_register (const char *name, interp_factory_func func); @@ -76,13 +78,11 @@ class interp { return false; } const char *name () const - { - return m_name.get (); - } + { return m_name; } private: - /* This is the name in "-i=" and "set interpreter". */ - gdb::unique_xmalloc_ptr m_name; + /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ + const char *m_name; public: /* Interpreters are stored in a linked list, this is the next -- 2.39.2