From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8166 invoked by alias); 24 Apr 2018 16:43:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 8157 invoked by uid 89); 24 Apr 2018 16:43:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=actions X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 24 Apr 2018 16:43:07 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AEAD640858CA; Tue, 24 Apr 2018 16:43:05 +0000 (UTC) Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17A7C7C53; Tue, 24 Apr 2018 16:43:04 +0000 (UTC) Subject: Re: [RFA 2/8] Use counted_command_line everywhere To: Tom Tromey , gdb-patches@sourceware.org References: <20180419191539.661-1-tom@tromey.com> <20180419191539.661-3-tom@tromey.com> From: Pedro Alves Message-ID: Date: Tue, 24 Apr 2018 16:43:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180419191539.661-3-tom@tromey.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-04/txt/msg00476.txt.bz2 On 04/19/2018 08:15 PM, Tom Tromey wrote: > Currently command lines are reference counted using shared_ptr only > when attached to breakpoints. This patch changes gdb to use > shared_ptr in commands as well. This allows for the removal of > copy_command_lines. > > Note that the change to execute_user_command explicitly makes a new > reference to the command line. This will be used in a later patch. > > This simplifies struct command_line based on the observation that a > given command can have at most two child bodies: an "if" can have both > "then" and "else" parts. Perhaps the names I've chosen for the > replacements here are not very good -- your input requested. > Names look fine to me. > @@ -2663,11 +2663,10 @@ trace_dump_actions (struct command_line *action, > > if (cmd_cfunc_eq (cmd, while_stepping_pseudocommand)) > { > - int i; > - > - for (i = 0; i < action->body_count; ++i) > - trace_dump_actions (action->body_list[i], > - 1, stepping_frame, from_tty); > + trace_dump_actions (action->body_list_0.get (), > + 1, stepping_frame, from_tty); > + trace_dump_actions (action->body_list_1.get (), > + 1, stepping_frame, from_tty); Hmm, this looked suspicious. I'm not seeing why would a while-stepping action have two body lists. I guess this happens to work because trace_dump_actions does nothing if ACTION is NULL. > @@ -2797,17 +2792,13 @@ all_tracepoint_actions_and_cleanup (struct breakpoint *t) > if (*default_collect) > { > struct command_line *default_collect_action; > - char *default_collect_line; > - > - default_collect_line = xstrprintf ("collect %s", default_collect); > - make_cleanup (xfree, default_collect_line); > + gdb::unique_xmalloc_ptr default_collect_line > + (xstrprintf ("collect %s", default_collect)); string_printf ? > > - validate_actionline (default_collect_line, t); > - default_collect_action = XNEW (struct command_line); > - make_cleanup (xfree, default_collect_action); > - default_collect_action->next = actions; > - default_collect_action->line = default_collect_line; > - actions = default_collect_action; > + validate_actionline (default_collect_line.get (), t); > + actions.reset (new struct command_line (simple_control, > + default_collect_line.release ()), > + command_lines_deleter ()); > } LGTM. It's a shame that we can't use std::make_shared to avoid the separate control block allocation. Thanks, Pedro Alves