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 BD1273858D37 for ; Fri, 28 Apr 2023 18:27:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BD1273858D37 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-143-198.qc.cable.ebox.net [192.222.143.198]) (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 D8E4B1E221; Fri, 28 Apr 2023 14:27:14 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/3] gdb: store interps in an intrusive_list Date: Fri, 28 Apr 2023 14:27:12 -0400 Message-Id: <20230428182713.216446-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230428182713.216446-1-simon.marchi@efficios.com> References: <20230428182713.216446-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3497.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,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: Use intrusive_list, instead of hand-made linked list. Change-Id: Idc857b40dfa3e3c35671045898331cca2c928097 --- gdb/interps.c | 18 ++++++------------ gdb/interps.h | 8 +++----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/gdb/interps.c b/gdb/interps.c index a066c4acfedf..54e1cb45db68 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -49,7 +49,7 @@ struct ui_interp_info DISABLE_COPY_AND_ASSIGN (ui_interp_info); /* Each top level has its own independent set of interpreters. */ - interp *interp_list = nullptr; + intrusive_list interp_list; interp *current_interpreter = nullptr; interp *top_level_interpreter = nullptr; @@ -132,8 +132,7 @@ interp_add (struct ui *ui, struct interp *interp) gdb_assert (interp_lookup_existing (ui, interp->name ()) == NULL); - interp->next = ui_interp.interp_list; - ui_interp.interp_list = interp; + ui_interp.interp_list.push_back (*interp); } /* This sets the current interpreter to be INTERP. If INTERP has not @@ -204,17 +203,12 @@ static struct interp * interp_lookup_existing (struct ui *ui, const char *name) { ui_interp_info &ui_interp = get_interp_info (ui); - struct interp *interp; - for (interp = ui_interp.interp_list; - interp != NULL; - interp = interp->next) - { - if (strcmp (interp->name (), name) == 0) - return interp; - } + for (interp &interp : ui_interp.interp_list) + if (strcmp (interp.name (), name) == 0) + return &interp; - return NULL; + return nullptr; } /* See interps.h. */ diff --git a/gdb/interps.h b/gdb/interps.h index 29248093c671..da78a5d89fae 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -22,6 +22,8 @@ #ifndef INTERPS_H #define INTERPS_H +#include "gdbsupport/intrusive_list.h" + struct ui_out; struct interp; struct ui; @@ -40,7 +42,7 @@ extern void interp_factory_register (const char *name, extern void interp_exec (struct interp *interp, const char *command); -class interp +class interp : public intrusive_list_node { public: explicit interp (const char *name); @@ -85,10 +87,6 @@ class interp const char *m_name; public: - /* Interpreters are stored in a linked list, this is the next - one... */ - interp *next = nullptr; - /* Has the init method been run? */ bool inited = false; }; -- 2.40.1