From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OCieMwhIul/UJQAAWB0awg (envelope-from ) for ; Sun, 22 Nov 2020 06:14:16 -0500 Received: by simark.ca (Postfix, from userid 112) id 767EC1F08E; Sun, 22 Nov 2020 06:14:16 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=MAILING_LIST_MULTI,RDNS_NONE autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (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 ESMTPS id A48F51EFBF for ; Sun, 22 Nov 2020 06:14:15 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B8C23851C33; Sun, 22 Nov 2020 11:14:15 +0000 (GMT) Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 6B885385803B for ; Sun, 22 Nov 2020 11:14:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6B885385803B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=brobecke@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 876AB1168BD; Sun, 22 Nov 2020 06:14:10 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id TRZR5InRfQPn; Sun, 22 Nov 2020 06:14:10 -0500 (EST) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 77C8B1165D2; Sun, 22 Nov 2020 06:14:10 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4233) id 76B17149; Sun, 22 Nov 2020 06:14:10 -0500 (EST) From: Joel Brobecker To: gdb-patches@sourceware.org Subject: [RFA v2 1/6] change and rename gmp_string_asprintf to return an std::string Date: Sun, 22 Nov 2020 06:14:01 -0500 Message-Id: <1606043646-140022-2-git-send-email-brobecker@adacore.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1606043646-140022-1-git-send-email-brobecker@adacore.com> References: <1605430184-81335-1-git-send-email-brobecker@adacore.com> <1606043646-140022-1-git-send-email-brobecker@adacore.com> 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: , Cc: Simon Marchi , Joel Brobecker Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" This was suggested by Simon during a code review of this package upstream. The upside is that this makes the function's API more natural and C++. The downside is an extra malloc, which might be the reason why we went for using a unique_xmalloc_ptr in the first place. Since this function is not expected to be called frequently, the API improvement might be worth the performance impact. gdb/ChangeLog: * gmp-utils.h (gmp_string_printf): Rename from gmp_string_asprintf. Change return type to std::string. Update all callers. * gmp-utils.c (gmp_string_printf): Likewise. --- gdb/gdbtypes.c | 2 +- gdb/gmp-utils.c | 17 ++++++++++++----- gdb/gmp-utils.h | 10 ++++------ gdb/typeprint.c | 5 ++--- gdb/valprint.c | 4 ++-- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index e6f70bb..3879eeb 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -4927,7 +4927,7 @@ static void print_fixed_point_type_info (struct type *type, int spaces) { printfi_filtered (spaces + 2, "scaling factor: %s\n", - fixed_point_scaling_factor (type).str ().get ()); + fixed_point_scaling_factor (type).str ().c_str ()); } static struct obstack dont_print_type_obstack; diff --git a/gdb/gmp-utils.c b/gdb/gmp-utils.c index db92e57..44fe156 100644 --- a/gdb/gmp-utils.c +++ b/gdb/gmp-utils.c @@ -19,17 +19,24 @@ /* See gmp-utils.h. */ -gdb::unique_xmalloc_ptr -gmp_string_asprintf (const char *fmt, ...) +std::string +gmp_string_printf (const char *fmt, ...) { va_list vp; - char *buf; va_start (vp, fmt); - gmp_vasprintf (&buf, fmt, vp); + int size = gmp_vsnprintf (NULL, 0, fmt, vp); va_end (vp); - return gdb::unique_xmalloc_ptr (buf); + std::string str (size, '\0'); + + /* C++11 and later guarantee std::string uses contiguous memory and + always includes the terminating '\0'. */ + va_start (vp, fmt); + gmp_vsprintf (&str[0], fmt, vp); + va_end (vp); + + return str; } /* See gmp-utils.h. */ diff --git a/gdb/gmp-utils.h b/gdb/gmp-utils.h index 1214b64..59965e5 100644 --- a/gdb/gmp-utils.h +++ b/gdb/gmp-utils.h @@ -29,9 +29,9 @@ #include #include "gdbsupport/traits.h" -/* Same as gmp_asprintf, but returning a convenient wrapper type. */ +/* Same as gmp_asprintf, but returning an std::string. */ -gdb::unique_xmalloc_ptr gmp_string_asprintf (const char *fmt, ...); +std::string gmp_string_printf (const char *fmt, ...); /* A class to make it easier to use GMP's mpz_t values within GDB. */ @@ -110,8 +110,7 @@ struct gdb_mpz bool unsigned_p) const; /* Return a string containing VAL. */ - gdb::unique_xmalloc_ptr str () const - { return gmp_string_asprintf ("%Zd", val); } + std::string str () const { return gmp_string_printf ("%Zd", val); } /* The destructor. */ ~gdb_mpz () { mpz_clear (val); } @@ -163,8 +162,7 @@ struct gdb_mpq } /* Return a string representing VAL as " / ". */ - gdb::unique_xmalloc_ptr str () const - { return gmp_string_asprintf ("%Qd", val); } + std::string str () const { return gmp_string_printf ("%Qd", val); } /* Return VAL rounded to the nearest integer. */ gdb_mpz get_rounded () const; diff --git a/gdb/typeprint.c b/gdb/typeprint.c index f947faf..0dd3b1c 100644 --- a/gdb/typeprint.c +++ b/gdb/typeprint.c @@ -667,11 +667,10 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream) void print_type_fixed_point (struct type *type, struct ui_file *stream) { - gdb::unique_xmalloc_ptr small_img - = fixed_point_scaling_factor (type).str (); + std::string small_img = fixed_point_scaling_factor (type).str (); fprintf_filtered (stream, "%s-byte fixed point (small = %s)", - pulongest (TYPE_LENGTH (type)), small_img.get ()); + pulongest (TYPE_LENGTH (type)), small_img.c_str ()); } /* Dump details of a type specified either directly or indirectly. diff --git a/gdb/valprint.c b/gdb/valprint.c index 38ae0bd..b102ff4 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -814,8 +814,8 @@ generic_val_print_fixed_point (struct value *val, struct ui_file *stream, fixed_point_scaling_factor (type)); const char *fmt = TYPE_LENGTH (type) < 4 ? "%.11Fg" : "%.17Fg"; - gdb::unique_xmalloc_ptr str = gmp_string_asprintf (fmt, f.val); - fprintf_filtered (stream, "%s", str.get ()); + std::string str = gmp_string_printf (fmt, f.val); + fprintf_filtered (stream, "%s", str.c_str ()); } } -- 2.1.4