From patchwork Thu Oct 10 00:04:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Biesinger X-Patchwork-Id: 34892 Received: (qmail 73880 invoked by alias); 10 Oct 2019 00:04:18 -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 73870 invoked by uid 89); 10 Oct 2019 00:04:18 -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_PASS autolearn=ham version=3.3.1 spammy=Continue, UD:id, abandon, 12611 X-HELO: mail-io1-f66.google.com Received: from mail-io1-f66.google.com (HELO mail-io1-f66.google.com) (209.85.166.66) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 10 Oct 2019 00:04:16 +0000 Received: by mail-io1-f66.google.com with SMTP id b19so9644404iob.4 for ; Wed, 09 Oct 2019 17:04:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EnFWAUXiBlYXf0mrOg5kfph5vZ0Xchh0HAwQwkF+Yvw=; b=fG8epaFmomQabpfgUXiL9aKwIEEd7qcAUMK3TZWrA6k0NHE5Sx3iw+/dnNNaqPguuy gbl+8JCYt9GEjh32+3fDXfZ9rYjEw0gMI5AMfQ7e+P6/2C6sguFKSVNul1XWbwsbFhfs 7tLPfZ0x4zieASj62Ffrq6J/xXFC9kE8Q77JU= Return-Path: Received: from cbiesinger.roam.corp.google.com (ip-174-152-211-21.chcgil.spcsdns.net. [174.152.211.21]) by smtp.googlemail.com with ESMTPSA id s201sm3509230ios.83.2019.10.09.17.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 17:04:12 -0700 (PDT) From: cbiesinger@chromium.org To: gdb-patches@sourceware.org Cc: Christian Biesinger Subject: [PATCH v3 1/2] Change iterate_over_breakpoints to take a function_view Date: Wed, 9 Oct 2019 19:04:02 -0500 Message-Id: <20191010000403.189265-1-cbiesinger@chromium.org> MIME-Version: 1.0 From: Christian Biesinger This allows callers to pass in capturing lambdas. Also changes the return type to bool. 2019-10-09 Christian Biesinger * breakpoint.c (iterate_over_breakpoints): Change function pointer to a gdb::function_view and return value to bool. * breakpoint.h (iterate_over_breakpoints): Likewise. * dummy-frame.c (pop_dummy_frame_bpt): Update. (pop_dummy_frame): Update. * guile/scm-breakpoint.c (bpscm_build_bp_list): Update. (gdbscm_breakpoints): Update. * python/py-breakpoint.c (build_bp_list): Update. (gdbpy_breakpoints): Update. * python/py-finishbreakpoint.c (bpfinishpy_detect_out_scope_cb): Update. (bpfinishpy_handle_stop): Update. (bpfinishpy_handle_exit): Update. * solib-svr4.c (svr4_update_solib_event_breakpoint): Update. (svr4_update_solib_event_breakpoints): Update. --- gdb/breakpoint.c | 6 +++--- gdb/breakpoint.h | 5 +++-- gdb/dummy-frame.c | 13 ++++++------- gdb/guile/scm-breakpoint.c | 8 ++++---- gdb/python/py-breakpoint.c | 8 ++++---- gdb/python/py-finishbreakpoint.c | 15 +++++++++------ gdb/solib-svr4.c | 6 +++--- 7 files changed, 32 insertions(+), 29 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 0a705163386..e17cb69c3e6 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -15132,14 +15132,14 @@ save_command (const char *arg, int from_tty) } struct breakpoint * -iterate_over_breakpoints (int (*callback) (struct breakpoint *, void *), - void *data) +iterate_over_breakpoints + (gdb::function_view callback) { struct breakpoint *b, *b_tmp; ALL_BREAKPOINTS_SAFE (b, b_tmp) { - if ((*callback) (b, data)) + if (callback (b)) return b; } diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 9791032c5e8..7472c0ecc45 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -29,6 +29,7 @@ #include "location.h" #include #include "gdbsupport/array-view.h" +#include "gdbsupport/function-view.h" #include "cli/cli-script.h" struct block; @@ -1664,8 +1665,8 @@ public: returned. This can be useful for implementing a search for a breakpoint with arbitrary attributes, or for applying an operation to every breakpoint. */ -extern struct breakpoint *iterate_over_breakpoints (int (*) (struct breakpoint *, - void *), void *); +extern struct breakpoint *iterate_over_breakpoints + (gdb::function_view); /* Nonzero if the specified PC cannot be a location where functions have been inlined. */ diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c index d3ede7c9a0c..aab8ddb337d 100644 --- a/gdb/dummy-frame.c +++ b/gdb/dummy-frame.c @@ -126,11 +126,9 @@ remove_dummy_frame (struct dummy_frame **dummy_ptr) /* Delete any breakpoint B which is a momentary breakpoint for return from inferior call matching DUMMY_VOIDP. */ -static int -pop_dummy_frame_bpt (struct breakpoint *b, void *dummy_voidp) +static bool +pop_dummy_frame_bpt (struct breakpoint *b, struct dummy_frame *dummy) { - struct dummy_frame *dummy = (struct dummy_frame *) dummy_voidp; - if (b->thread == dummy->id.thread->global_num && b->disposition == disp_del && frame_id_eq (b->frame_id, dummy->id.id)) { @@ -140,11 +138,11 @@ pop_dummy_frame_bpt (struct breakpoint *b, void *dummy_voidp) delete_breakpoint (b); /* Stop the traversal. */ - return 1; + return true; } /* Continue the traversal. */ - return 0; + return false; } /* Pop *DUMMY_PTR, restoring program state to that before the @@ -168,7 +166,8 @@ pop_dummy_frame (struct dummy_frame **dummy_ptr) restore_infcall_suspend_state (dummy->caller_state); - iterate_over_breakpoints (pop_dummy_frame_bpt, dummy); + iterate_over_breakpoints ([dummy] (breakpoint* bp) + { return pop_dummy_frame_bpt (bp, dummy); }); /* restore_infcall_control_state frees inf_state, all that remains is to pop *dummy_ptr. */ diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c index 9a4efee92dc..b97c5022e50 100644 --- a/gdb/guile/scm-breakpoint.c +++ b/gdb/guile/scm-breakpoint.c @@ -505,10 +505,9 @@ gdbscm_delete_breakpoint_x (SCM self) /* iterate_over_breakpoints function for gdbscm_breakpoints. */ -static int -bpscm_build_bp_list (struct breakpoint *bp, void *arg) +static bool +bpscm_build_bp_list (struct breakpoint *bp, SCM *list) { - SCM *list = (SCM *) arg; breakpoint_smob *bp_smob = bp->scm_bp_object; /* Lazily create wrappers for breakpoints created outside Scheme. */ @@ -548,7 +547,8 @@ gdbscm_breakpoints (void) /* If iterate_over_breakpoints returns non-NULL it means the iteration terminated early. In that case abandon building the list and return #f. */ - if (iterate_over_breakpoints (bpscm_build_bp_list, &list) != NULL) + if (iterate_over_breakpoints + ([&] (breakpoint *bp) { return bpscm_build_bp_list(bp, &list); }) != NULL) return SCM_BOOL_F; return scm_reverse_x (list, SCM_EOL); diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 698d91e9d32..cf3311a5e1f 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -871,10 +871,9 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) -static int -build_bp_list (struct breakpoint *b, void *arg) +static bool +build_bp_list (struct breakpoint *b, PyObject *list) { - PyObject *list = (PyObject *) arg; PyObject *bp = (PyObject *) b->py_bp_object; int iserr = 0; @@ -906,7 +905,8 @@ gdbpy_breakpoints (PyObject *self, PyObject *args) /* If iterate_over_breakpoints returns non NULL it signals an error condition. In that case abandon building the list and return NULL. */ - if (iterate_over_breakpoints (build_bp_list, list.get ()) != NULL) + if (iterate_over_breakpoints + ([&] (breakpoint *bp) { return build_bp_list(bp, list.get ()); }) != NULL) return NULL; return PyList_AsTuple (list.get ()); diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index 7784a92bffb..3cbc2b10d75 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -341,10 +341,10 @@ bpfinishpy_out_of_scope (struct finish_breakpoint_object *bpfinish_obj) /* Callback for `bpfinishpy_detect_out_scope'. Triggers Python's `B->out_of_scope' function if B is a FinishBreakpoint out of its scope. */ -static int -bpfinishpy_detect_out_scope_cb (struct breakpoint *b, void *args) +static bool +bpfinishpy_detect_out_scope_cb (struct breakpoint *b, + struct breakpoint *bp_stopped) { - struct breakpoint *bp_stopped = (struct breakpoint *) args; PyObject *py_bp = (PyObject *) b->py_bp_object; /* Trigger out_of_scope if this is a FinishBreakpoint and its frame is @@ -383,8 +383,9 @@ bpfinishpy_handle_stop (struct bpstats *bs, int print_frame) { gdbpy_enter enter_py (get_current_arch (), current_language); - iterate_over_breakpoints (bpfinishpy_detect_out_scope_cb, - bs == NULL ? NULL : bs->breakpoint_at); + iterate_over_breakpoints ([&] (breakpoint *bp) { + return bpfinishpy_detect_out_scope_cb + (bp, bs == NULL ? NULL : bs->breakpoint_at); }); } /* Attached to `exit' notifications, triggers all the necessary out of @@ -395,7 +396,9 @@ bpfinishpy_handle_exit (struct inferior *inf) { gdbpy_enter enter_py (target_gdbarch (), current_language); - iterate_over_breakpoints (bpfinishpy_detect_out_scope_cb, NULL); + iterate_over_breakpoints ([&] (breakpoint *bp) { + return bpfinishpy_detect_out_scope_cb + (bp, nullptr); }); } /* Initialize the Python finish breakpoint code. */ diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index aa4af346b45..834596ab867 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -1991,8 +1991,8 @@ svr4_handle_solib_event (void) /* Helper function for svr4_update_solib_event_breakpoints. */ -static int -svr4_update_solib_event_breakpoint (struct breakpoint *b, void *arg) +static bool +svr4_update_solib_event_breakpoint (struct breakpoint *b) { struct bp_location *loc; @@ -2036,7 +2036,7 @@ svr4_update_solib_event_breakpoint (struct breakpoint *b, void *arg) static void svr4_update_solib_event_breakpoints (void) { - iterate_over_breakpoints (svr4_update_solib_event_breakpoint, NULL); + iterate_over_breakpoints (svr4_update_solib_event_breakpoint); } /* Create and register solib event breakpoints. PROBES is an array