From patchwork Fri Sep 29 01:41:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 23219 Received: (qmail 58406 invoked by alias); 29 Sep 2017 01:42:59 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 58395 invoked by uid 89); 29 Sep 2017 01:42:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gproxy10-pub.mail.unifiedlayer.com Received: from gproxy10-pub.mail.unifiedlayer.com (HELO gproxy10-pub.mail.unifiedlayer.com) (69.89.20.226) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 29 Sep 2017 01:42:58 +0000 Received: from cmgw2 (unknown [10.0.90.83]) by gproxy10.mail.unifiedlayer.com (Postfix) with ESMTP id A9E6414071F for ; Thu, 28 Sep 2017 19:41:37 -0600 (MDT) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw2 with id FDha1w00i2f2jeq01DhdR5; Thu, 28 Sep 2017 19:41:37 -0600 X-Authority-Analysis: v=2.2 cv=dZfw5Tfe c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=2JCJgTwv5E4A:10 a=20KFwNOVAAAA:8 a=zstS-IiYAAAA:8 a=S261vAN5uqj2KkUC2dUA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 75-166-0-208.hlrn.qwest.net ([75.166.0.208]:34846 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dxkJ4-0003Mk-Cd; Thu, 28 Sep 2017 19:41:34 -0600 From: Tom Tromey To: Pedro Alves Cc: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [RFA 08/11] Use string and unique_xmalloc_ptr in mi-main.c References: <20170912185736.20436-1-tom@tromey.com> <20170912185736.20436-9-tom@tromey.com> <106d764a-be15-161a-355e-323e7e28a036@redhat.com> Date: Thu, 28 Sep 2017 19:41:32 -0600 In-Reply-To: <106d764a-be15-161a-355e-323e7e28a036@redhat.com> (Pedro Alves's message of "Thu, 28 Sep 2017 10:57:09 +0100") Message-ID: <87efqqwab7.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) MIME-Version: 1.0 X-BWhitelist: no X-Exim-ID: 1dxkJ4-0003Mk-Cd X-Source-Sender: 75-166-0-208.hlrn.qwest.net (bapiya) [75.166.0.208]:34846 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes >>>>> "Pedro" == Pedro Alves writes: Pedro> How about replacing this string building + field_string with a single Pedro> call to: Pedro> uiout-> field_fmt ("name", "$%s", tsv->name); Here's an update. Tom diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9cd584b..1edd8ee 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2017-09-12 Tom Tromey + * mi/mi-main.c (mi_execute_cli_command): Use std::string. + (mi_execute_async_cli_command): Likewise. + (mi_cmd_trace_frame_collected): Use field_fmt. + +2017-09-12 Tom Tromey + * mi/mi-main.c (mi_cmd_data_write_memory_bytes): Use gdb::byte_vector. diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index e1ba8e2..2d560a4 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -2269,41 +2269,29 @@ mi_execute_cli_command (const char *cmd, int args_p, const char *args) { if (cmd != 0) { - struct cleanup *old_cleanups; - char *run; + std::string run = cmd; if (args_p) - run = xstrprintf ("%s %s", cmd, args); - else - run = xstrdup (cmd); + run = run + " " + args; if (mi_debug_p) /* FIXME: gdb_???? */ fprintf_unfiltered (gdb_stdout, "cli=%s run=%s\n", - cmd, run); - old_cleanups = make_cleanup (xfree, run); - execute_command (run, 0 /* from_tty */ ); - do_cleanups (old_cleanups); - return; + cmd, run.c_str ()); + execute_command (&run[0], 0 /* from_tty */ ); } } void mi_execute_async_cli_command (const char *cli_command, char **argv, int argc) { - struct cleanup *old_cleanups; - char *run; + std::string run = cli_command; + if (argc) + run = run + " " + *argv; if (mi_async_p ()) - run = xstrprintf ("%s %s&", cli_command, argc ? *argv : ""); - else - run = xstrprintf ("%s %s", cli_command, argc ? *argv : ""); - old_cleanups = make_cleanup (xfree, run); + run += "&"; - execute_command (run, 0 /* from_tty */ ); - - /* Do this before doing any printing. It would appear that some - print code leaves garbage around in the buffer. */ - do_cleanups (old_cleanups); + execute_command (&run[0], 0 /* from_tty */ ); } void @@ -2806,14 +2794,10 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc) { struct cleanup *cleanups; int tvar; - char *tsvname; int i; ui_out_emit_list list_emitter (uiout, "tvars"); - tsvname = NULL; - cleanups = make_cleanup (free_current_contents, &tsvname); - for (i = 0; VEC_iterate (int, tinfo->tvars, i, tvar); i++) { struct trace_state_variable *tsv; @@ -2824,10 +2808,7 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc) if (tsv != NULL) { - tsvname = (char *) xrealloc (tsvname, strlen (tsv->name) + 2); - tsvname[0] = '$'; - strcpy (tsvname + 1, tsv->name); - uiout->field_string ("name", tsvname); + uiout->field_fmt ("name", "$%s", tsv->name); tsv->value_known = target_get_trace_state_variable_value (tsv->number, &tsv->value); @@ -2839,8 +2820,6 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc) uiout->field_skip ("current"); } } - - do_cleanups (cleanups); } /* Memory. */