From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7566 invoked by alias); 2 Nov 2017 22:36:23 -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 7302 invoked by uid 89); 2 Nov 2017 22:36:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=6448, rfa X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.189) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 02 Nov 2017 22:36:18 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway32.websitewelcome.com (Postfix) with ESMTP id D3A60F8F0 for ; Thu, 2 Nov 2017 17:36:16 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id AO5we1wCwtuxmAO5wePhbd; Thu, 02 Nov 2017 17:36:16 -0500 Received: from 71-218-90-63.hlrn.qwest.net ([71.218.90.63]:58978 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eAO5w-003CfJ-In; Thu, 02 Nov 2017 17:36:16 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 06/13] Replace start_rbreak_breakpoints and end_rbreak_breakpoints Date: Thu, 02 Nov 2017 22:36:00 -0000 Message-Id: <20171102223612.3642-7-tom@tromey.com> In-Reply-To: <20171102223612.3642-1-tom@tromey.com> References: <20171102223612.3642-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1eAO5w-003CfJ-In X-Source-Sender: 71-218-90-63.hlrn.qwest.net (bapiya.Home) [71.218.90.63]:58978 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-SW-Source: 2017-11/txt/msg00041.txt.bz2 This replaces start_rbreak_breakpoints and end_rbreak_breakpoints with a new scoped class. This allows the removal of a cleanup. gdb/ChangeLog 2017-11-02 Tom Tromey * breakpoint.c (scoped_rbreak_breakpoints::scoped_rbreak_breakpoints): Rename from start_rbreak_breakpoints. (scoped_rbreak_breakpoints): Rename from end_rbreak_breakpoints. * breakpoint.h (class scoped_rbreak_breakpoints): New. (start_rbreak_breakpoints, end_rbreak_breakpoints): Remove. * symtab.c (do_end_rbreak_breakpoints): Remove. (rbreak_command): Use scoped_rbreak_breakpoints. --- gdb/ChangeLog | 11 +++++++++++ gdb/breakpoint.c | 6 ++---- gdb/breakpoint.h | 16 ++++++++++++---- gdb/symtab.c | 14 +------------- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 0bf47d5f56..61e41283b1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -644,8 +644,7 @@ static int rbreak_start_breakpoint_count; /* Called at the start an "rbreak" command to record the first breakpoint made. */ -void -start_rbreak_breakpoints (void) +scoped_rbreak_breakpoints::scoped_rbreak_breakpoints () { rbreak_start_breakpoint_count = breakpoint_count; } @@ -653,8 +652,7 @@ start_rbreak_breakpoints (void) /* Called at the end of an "rbreak" command to record the last breakpoint made. */ -void -end_rbreak_breakpoints (void) +scoped_rbreak_breakpoints::~scoped_rbreak_breakpoints () { prev_breakpoint_count = rbreak_start_breakpoint_count; } diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 9a9433bd66..69b63ea932 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1601,10 +1601,18 @@ extern VEC(breakpoint_p) *static_tracepoints_here (CORE_ADDR addr); that each command is suitable for tracepoint command list. */ extern void check_tracepoint_command (char *line, void *closure); -/* Call at the start and end of an "rbreak" command to register - breakpoint numbers for a later "commands" command. */ -extern void start_rbreak_breakpoints (void); -extern void end_rbreak_breakpoints (void); +/* Create an instance of this to start registering breakpoint numbers + for a later "commands" command. */ + +class scoped_rbreak_breakpoints +{ +public: + + scoped_rbreak_breakpoints (); + ~scoped_rbreak_breakpoints (); + + DISABLE_COPY_AND_ASSIGN (scoped_rbreak_breakpoints); +}; /* Breakpoint iterator function. diff --git a/gdb/symtab.c b/gdb/symtab.c index 16a6b2eb6f..b1c3515cc7 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -4506,18 +4506,9 @@ rbreak_command_wrapper (char *regexp, int from_tty) rbreak_command (regexp, from_tty); } -/* A cleanup function that calls end_rbreak_breakpoints. */ - -static void -do_end_rbreak_breakpoints (void *ignore) -{ - end_rbreak_breakpoints (); -} - static void rbreak_command (char *regexp, int from_tty) { - struct cleanup *old_chain; char *string = NULL; int len = 0; const char **files = NULL; @@ -4550,8 +4541,7 @@ rbreak_command (char *regexp, int from_tty) FUNCTIONS_DOMAIN, nfiles, files); - start_rbreak_breakpoints (); - old_chain = make_cleanup (do_end_rbreak_breakpoints, NULL); + scoped_rbreak_breakpoints finalize; for (const symbol_search &p : symbols) { if (p.msymbol.minsym == NULL) @@ -4596,8 +4586,6 @@ rbreak_command (char *regexp, int from_tty) MSYMBOL_PRINT_NAME (p.msymbol.minsym)); } } - - do_cleanups (old_chain); } -- 2.13.6