From patchwork Wed Jan 9 03:34:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 30999 Received: (qmail 36615 invoked by alias); 9 Jan 2019 03:34:34 -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 36566 invoked by uid 89); 9 Jan 2019 03:34:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=UD:infrun.c, substitute, sk:do_bpst, frame.h X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.143.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Jan 2019 03:34:30 +0000 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 97776267A for ; Tue, 8 Jan 2019 21:34:29 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id h4dRgogcIiQerh4dRgqDOD; Tue, 08 Jan 2019 21:34:29 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EJexgM9CkKrCMBfag9ZrF7lc5ZMCebf9Xc3EDXvIeso=; b=Gzw9gXp90M+j/gSIYqZx3xqIFz b7hcfl4NvPqpv6VBNDUF6sFN33h1xLqMM5ib0cA4ziMEZAR/BcvEFBEj+109dr/Fr3fCcUcwNoMDJ 3j9DYr0g3pyjN3QntezGKzrpM; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:47026 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gh4dR-000HG2-CZ; Tue, 08 Jan 2019 21:34:29 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 03/12] Remove make_bpstat_clear_actions_cleanup Date: Tue, 8 Jan 2019 20:34:17 -0700 Message-Id: <20190109033426.16062-4-tom@tromey.com> In-Reply-To: <20190109033426.16062-1-tom@tromey.com> References: <20190109033426.16062-1-tom@tromey.com> This removes make_bpstat_clear_actions_cleanup, replacing it with uses of cleanup_function. gdb/ChangeLog 2019-01-08 Tom Tromey * infrun.c (fetch_inferior_event): Use cleanup_function. * utils.h (make_bpstat_clear_actions_cleanup): Don't declare. * top.c (execute_command): Use cleanup_function. * breakpoint.c (bpstat_do_actions): Use cleanup_function. * utils.c (do_bpstat_clear_actions_cleanup) (make_bpstat_clear_actions_cleanup): Remove. --- gdb/ChangeLog | 9 +++++++++ gdb/breakpoint.c | 4 ++-- gdb/infrun.c | 10 ++++++---- gdb/top.c | 8 ++++---- gdb/utils.c | 17 ----------------- gdb/utils.h | 1 - 6 files changed, 21 insertions(+), 28 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 3acb5145b9..4726e452a6 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4474,7 +4474,7 @@ get_bpstat_thread () void bpstat_do_actions (void) { - struct cleanup *cleanup_if_error = make_bpstat_clear_actions_cleanup (); + cleanup_function cleanup_if_error (bpstat_clear_actions); thread_info *tp; /* Do any commands attached to breakpoint we are stopped at. */ @@ -4488,7 +4488,7 @@ bpstat_do_actions (void) break; } - discard_cleanups (cleanup_if_error); + cleanup_if_error.cancel (); } /* Print out the (old or new) value associated with a watchpoint. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index 150288264f..d84ed10b61 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -67,6 +67,7 @@ #include "progspace-and-thread.h" #include "common/gdb_optional.h" #include "arch-utils.h" +#include "common/cleanup-function.h" /* Prototypes for local functions */ @@ -3758,9 +3759,9 @@ fetch_inferior_event (void *client_data) /* Get executed before make_cleanup_restore_current_thread above to apply still for the thread which has thrown the exception. */ - struct cleanup *ts_old_chain = make_bpstat_clear_actions_cleanup (); - - make_cleanup (delete_just_stopped_threads_infrun_breakpoints_cleanup, NULL); + cleanup_function defer_bpstat_clear (bpstat_clear_actions); + cleanup_function defer_delete_threads + (delete_just_stopped_threads_infrun_breakpoints); /* Now figure out what to do with the result of the result. */ handle_inferior_event (ecs); @@ -3813,7 +3814,8 @@ fetch_inferior_event (void *client_data) } } - discard_cleanups (ts_old_chain); + defer_delete_threads.cancel (); + defer_bpstat_clear.cancel (); /* No error, don't finish the thread states yet. */ finish_state.release (); diff --git a/gdb/top.c b/gdb/top.c index 900e78aaec..06911a110f 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -52,6 +52,7 @@ #include "frame.h" #include "buffer.h" #include "gdb_select.h" +#include "common/cleanup-function.h" /* readline include files. */ #include "readline/readline.h" @@ -539,12 +540,11 @@ set_repeat_arguments (const char *args) void execute_command (const char *p, int from_tty) { - struct cleanup *cleanup_if_error; struct cmd_list_element *c; const char *line; const char *cmd_start = p; - cleanup_if_error = make_bpstat_clear_actions_cleanup (); + cleanup_function cleanup_if_error (bpstat_clear_actions); scoped_value_mark cleanup = prepare_execute_command (); /* Force cleanup of any alloca areas if using C alloca instead of @@ -554,7 +554,7 @@ execute_command (const char *p, int from_tty) /* This can happen when command_line_input hits end of file. */ if (p == NULL) { - discard_cleanups (cleanup_if_error); + cleanup_if_error.cancel (); return; } @@ -649,7 +649,7 @@ execute_command (const char *p, int from_tty) if (has_stack_frames () && inferior_thread ()->state != THREAD_RUNNING) check_frame_language_change (); - discard_cleanups (cleanup_if_error); + cleanup_if_error.cancel (); } /* Run execute_command for P and FROM_TTY. Capture its output into the diff --git a/gdb/utils.c b/gdb/utils.c index ed8d60fa7b..4af75e3480 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3057,23 +3057,6 @@ parse_pid_to_attach (const char *args) return pid; } -/* Helper for make_bpstat_clear_actions_cleanup. */ - -static void -do_bpstat_clear_actions_cleanup (void *unused) -{ - bpstat_clear_actions (); -} - -/* Call bpstat_clear_actions for the case an exception is throw. You should - discard_cleanups if no exception is caught. */ - -struct cleanup * -make_bpstat_clear_actions_cleanup (void) -{ - return make_cleanup (do_bpstat_clear_actions_cleanup, NULL); -} - /* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP must come from xrealloc-compatible allocator and it may be updated. FROM needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be diff --git a/gdb/utils.h b/gdb/utils.h index f2fe1da832..896feb973c 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -286,7 +286,6 @@ private: int m_save_batch_flag; }; -extern struct cleanup *make_bpstat_clear_actions_cleanup (void); /* Path utilities. */