From patchwork Tue Feb 14 04:21:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 64940 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 21EDF3858416 for ; Tue, 14 Feb 2023 04:22:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21EDF3858416 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676348562; bh=Q6qBans4geLExhzURRH5u/exuMhE0O0hnmbq+WrchBE=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=MaXU/FoQXZcijBuwNPRPkZTJazjrONlFbwRcZYuODrU2OYElli0ExU3BN7AmUS/1y Ubn8ijR9OOteOzOP9N2CnH/+6ZXFbPhVM8FP0v7ufdo885e4T0KyDqgzao61iOdT82 d508dyqDOw1kXprwhdGDs+vZLfZ/mtaEPiHXAN7w= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 73D743858D1E for ; Tue, 14 Feb 2023 04:21:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 73D743858D1E Received: from localhost.localdomain (unknown [217.28.27.60]) (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 EA1FF1E110; Mon, 13 Feb 2023 23:21:40 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/3] gdb: store internalvars in an std::vector Date: Mon, 13 Feb 2023 23:21:37 -0500 Message-Id: <20230214042139.73638-1-simon.marchi@efficios.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1173.9 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change the storage of internalvars to an std::vector of unique pointers to internalval. This helps automate memory management, and will help keep internalvars sorted in a subsequent patch. I initially tried to use an std::vector initially, but some parts of the code need for the addresses of internalvars to be stable. Change-Id: I1fca7e7877cc984a3a3432c7639d45e68d437241 --- gdb/value.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index 7873aeb9558e..e884913abe5a 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1829,7 +1829,6 @@ union internalvar_data struct internalvar { - struct internalvar *next; char *name; /* We support various different kinds of content of an internal variable. @@ -1841,7 +1840,9 @@ struct internalvar union internalvar_data u; }; -static struct internalvar *internalvars; +using internalvar_up = std::unique_ptr; + +static std::vector internalvars; /* If the variable does not already exist create it and give it the value given. If no value is given then the default is zero. */ @@ -1891,11 +1892,9 @@ init_if_undefined_command (const char* args, int from_tty) struct internalvar * lookup_only_internalvar (const char *name) { - struct internalvar *var; - - for (var = internalvars; var; var = var->next) + for (internalvar_up &var : internalvars) if (strcmp (var->name, name) == 0) - return var; + return var.get (); return NULL; } @@ -1906,12 +1905,11 @@ lookup_only_internalvar (const char *name) void complete_internalvar (completion_tracker &tracker, const char *name) { - struct internalvar *var; int len; len = strlen (name); - for (var = internalvars; var; var = var->next) + for (internalvar_up &var : internalvars) if (strncmp (var->name, name, len) == 0) tracker.add_completion (make_unique_xstrdup (var->name)); } @@ -1922,12 +1920,12 @@ complete_internalvar (completion_tracker &tracker, const char *name) struct internalvar * create_internalvar (const char *name) { - struct internalvar *var = XNEW (struct internalvar); + internalvars.emplace_back (new internalvar); + internalvar *var = internalvars.back ().get (); var->name = xstrdup (name); var->kind = INTERNALVAR_VOID; - var->next = internalvars; - internalvars = var; + return var; } @@ -2412,8 +2410,6 @@ preserve_one_varobj (struct varobj *varobj, struct objfile *objfile, void preserve_values (struct objfile *objfile) { - struct internalvar *var; - /* Create the hash table. We allocate on the objfile's obstack, since it is soon to be deleted. */ htab_up copied_types = create_copied_types_hash (); @@ -2421,8 +2417,8 @@ preserve_values (struct objfile *objfile) for (const value_ref_ptr &item : value_history) item->preserve (objfile, copied_types.get ()); - for (var = internalvars; var; var = var->next) - preserve_one_internalvar (var, objfile, copied_types.get ()); + for (internalvar_up &var : internalvars) + preserve_one_internalvar (var.get (), objfile, copied_types.get ()); /* For the remaining varobj, check that none has type owned by OBJFILE. */ all_root_varobjs ([&copied_types, objfile] (struct varobj *varobj) @@ -2438,14 +2434,12 @@ static void show_convenience (const char *ignore, int from_tty) { struct gdbarch *gdbarch = get_current_arch (); - struct internalvar *var; int varseen = 0; struct value_print_options opts; get_user_print_options (&opts); - for (var = internalvars; var; var = var->next) + for (internalvar_up &var : internalvars) { - if (!varseen) { varseen = 1; @@ -2456,7 +2450,7 @@ show_convenience (const char *ignore, int from_tty) { struct value *val; - val = value_of_internalvar (gdbarch, var); + val = value_of_internalvar (gdbarch, var.get ()); value_print (val, gdb_stdout, &opts); } catch (const gdb_exception_error &ex) From patchwork Tue Feb 14 04:21:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 64938 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 EAB3A3858434 for ; Tue, 14 Feb 2023 04:22:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAB3A3858434 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676348531; bh=Ed9GRdvnjF7CPD5fzXrwIDGNyVlahbeWYEeX6tSLkcQ=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=BKklZVR7vvNc89k7Ej6FP8FhKtNKxF8JsAWlNeQfurnqo8HaTOFb63xqBxfASEUSP SspME9K3w4PqJQBpZEGmhnfDFaPE11QNmI0/axfQ4jf8YkR+BBNVz/k90r5ooL2I6h CjIMFk8s9M74AA5WaJJh0KwXvdRYQ8bNXEJep8bg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 791113858D20 for ; Tue, 14 Feb 2023 04:21:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 791113858D20 Received: from localhost.localdomain (unknown [217.28.27.60]) (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 2F2B81E128; Mon, 13 Feb 2023 23:21:41 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/3] gdb: use std::string for internalvar::name Date: Mon, 13 Feb 2023 23:21:38 -0500 Message-Id: <20230214042139.73638-2-simon.marchi@efficios.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214042139.73638-1-simon.marchi@efficios.com> References: <20230214042139.73638-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1173.9 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change internalvar::name to std::string, automating memory management. Change-Id: I814d61361663e7becb8f3fb5f58c0180cdc414bc --- gdb/value.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index e884913abe5a..68499896af8c 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1829,7 +1829,7 @@ union internalvar_data struct internalvar { - char *name; + std::string name; /* We support various different kinds of content of an internal variable. enum internalvar_kind specifies the kind, and union internalvar_data @@ -1893,7 +1893,7 @@ struct internalvar * lookup_only_internalvar (const char *name) { for (internalvar_up &var : internalvars) - if (strcmp (var->name, name) == 0) + if (var->name == name) return var.get (); return NULL; @@ -1910,8 +1910,8 @@ complete_internalvar (completion_tracker &tracker, const char *name) len = strlen (name); for (internalvar_up &var : internalvars) - if (strncmp (var->name, name, len) == 0) - tracker.add_completion (make_unique_xstrdup (var->name)); + if (strncmp (var->name.c_str (), name, len) == 0) + tracker.add_completion (make_unique_xstrdup (var->name.c_str ())); } /* Create an internal variable with name NAME and with a void value. @@ -1923,7 +1923,7 @@ create_internalvar (const char *name) internalvars.emplace_back (new internalvar); internalvar *var = internalvars.back ().get (); - var->name = xstrdup (name); + var->name = name; var->kind = INTERNALVAR_VOID; return var; @@ -1994,7 +1994,7 @@ value_of_internalvar (struct gdbarch *gdbarch, struct internalvar *var) /* If there is a trace state variable of the same name, assume that is what we really want to see. */ - tsv = find_trace_state_variable (var->name); + tsv = find_trace_state_variable (var->name.c_str ()); if (tsv) { tsv->value_known = target_get_trace_state_variable_value (tsv->number, @@ -2147,7 +2147,7 @@ set_internalvar (struct internalvar *var, struct value *val) union internalvar_data new_data = { 0 }; if (var->kind == INTERNALVAR_FUNCTION && var->u.fn.canonical) - error (_("Cannot overwrite convenience function %s"), var->name); + error (_("Cannot overwrite convenience function %s"), var->name.c_str ()); /* Prepare new contents. */ switch (check_typedef (val->type ())->code ()) @@ -2259,7 +2259,7 @@ clear_internalvar (struct internalvar *var) const char * internalvar_name (const struct internalvar *var) { - return var->name; + return var->name.c_str (); } static struct internal_function * @@ -2444,7 +2444,7 @@ show_convenience (const char *ignore, int from_tty) { varseen = 1; } - gdb_printf (("$%s = "), var->name); + gdb_printf (("$%s = "), var->name.c_str ()); try { From patchwork Tue Feb 14 04:21:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 64939 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 7CC243858417 for ; Tue, 14 Feb 2023 04:22:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CC243858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676348531; bh=5zyKHuRJkBAifpLx+PPJvaa+Mq7OiYotWkFoUZauRhE=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=t78igutD1ND4O659TMIfFJekNMjJWUe8WQXDI58fB9Yte0rsSweXytdZ27tiSPZXo cBzGBWNPsjewCTMqrNEvjHBL+TZ95fX/GpIfq+T8sIEfSh3zbyPpNumnBzkKUoOxll BAHy7a7adsKhNT1XGFZJagBEqQxV3KA8gNQurjp8= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id D70833858D33 for ; Tue, 14 Feb 2023 04:21:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D70833858D33 Received: from localhost.localdomain (unknown [217.28.27.60]) (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 659DA1E221; Mon, 13 Feb 2023 23:21:41 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 3/3] gdb: keep internalvars sorted Date: Mon, 13 Feb 2023 23:21:39 -0500 Message-Id: <20230214042139.73638-3-simon.marchi@efficios.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214042139.73638-1-simon.marchi@efficios.com> References: <20230214042139.73638-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1173.9 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" In a test (downstream in ROCgdb), there was a test case failing when GDB_REVERSE_INIT_FUNCTIONS was set. The test was assuming a particular order in the output of "show convenience". And the order changed with GDB_REVERSE_INIT_FUNCTIONS. I think that a nice way to fix it is to make the output of "show convenience" sorted, and therefore stable. Ideally, I think that the the user-visible behavior of GDB should not change when using GDB_REVERSE_INIT_FUNCTIONS. Plus, it makes the output of "show convenience" look nice, not that it's really important. So, change create_internalvar to keep the internalvars vector sorted. Change-Id: I3a916a641e0d50ff698f5d097ef0cf10637ab8de --- gdb/value.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index 68499896af8c..2c37f94cba99 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1920,8 +1920,15 @@ complete_internalvar (completion_tracker &tracker, const char *name) struct internalvar * create_internalvar (const char *name) { - internalvars.emplace_back (new internalvar); - internalvar *var = internalvars.back ().get (); + auto it = std::lower_bound (internalvars.begin (), + internalvars.end (), + name, + [] (const internalvar_up &var, const char *name_) + { + return var->name < name_; + }); + + internalvar *var = internalvars.emplace (it, new internalvar)->get (); var->name = name; var->kind = INTERNALVAR_VOID;