From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 8007D385696B for ; Tue, 2 May 2023 20:56:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8007D385696B Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 2ED871E11D; Tue, 2 May 2023 16:56:23 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 27/30] gdb: add interp::on_breakpoint_deleted method Date: Tue, 2 May 2023 16:50:07 -0400 Message-Id: <20230502205011.132151-28-simon.marchi@efficios.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com> References: <20230502205011.132151-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3497.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Same idea as previous patches, but for breakpoint_deleted. Change-Id: I59c231ce963491bb1eee1432ee1090138f09e19c --- gdb/breakpoint.c | 11 ++++++++++- gdb/interps.c | 8 ++++++++ gdb/interps.h | 6 ++++++ gdb/mi/mi-interp.c | 27 ++++++--------------------- gdb/mi/mi-interp.h | 1 + 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index a600bc7cc7fc..430e3b959ddf 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -12329,6 +12329,15 @@ strace_marker_p (struct breakpoint *b) return b->type == bp_static_marker_tracepoint; } +/* Notify interpreters and observers that breakpoint B was deleted. */ + +static void +notify_breakpoint_deleted (breakpoint *b) +{ + interps_notify_breakpoint_deleted (b); + gdb::observers::breakpoint_deleted.notify (b); +} + /* Delete a breakpoint and clean up all traces of it in the data structures. */ @@ -12384,7 +12393,7 @@ delete_breakpoint (struct breakpoint *bpt) a problem in that process, we'll be asked to delete the half-created watchpoint. In that case, don't announce the deletion. */ if (bpt->number) - gdb::observers::breakpoint_deleted.notify (bpt); + notify_breakpoint_deleted (bpt); if (breakpoint_chain == bpt) breakpoint_chain = bpt->next; diff --git a/gdb/interps.c b/gdb/interps.c index f8f97513ac66..dc36af64f4c4 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -567,6 +567,14 @@ interps_notify_breakpoint_created (breakpoint *b) interps_notify (&interp::on_breakpoint_created, b); } +/* See interps.h. */ + +void +interps_notify_breakpoint_deleted (breakpoint *b) +{ + interps_notify (&interp::on_breakpoint_deleted, b); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index b1e2903e1571..0e17b14735c0 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -169,6 +169,9 @@ class interp : public intrusive_list_node /* Notify the interpreter that breakpoint B was created. */ virtual void on_breakpoint_created (breakpoint *b) {} + /* Notify the interpreter that breakpoint B was deleted. */ + virtual void on_breakpoint_deleted (breakpoint *b) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -341,6 +344,9 @@ extern void interps_notify_tsv_modified (const trace_state_variable *tsv); /* Notify all interpreters that breakpoint B was created. */ extern void interps_notify_breakpoint_created (breakpoint *b); +/* Notify all interpreters that breakpoint B was deleted. */ +extern void interps_notify_breakpoint_deleted (breakpoint *b); + /* well-known interpreters */ #define INTERP_CONSOLE "console" #define INTERP_MI2 "mi2" diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index d7df572546c4..334d7f9c5a82 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -60,7 +60,6 @@ static int mi_interp_query_hook (const char *ctlstr, va_list ap) static void mi_insert_notify_hooks (void); static void mi_remove_notify_hooks (void); -static void mi_breakpoint_deleted (struct breakpoint *b); static void mi_breakpoint_modified (struct breakpoint *b); static void mi_command_param_changed (const char *param, const char *value); static void mi_memory_changed (struct inferior *inf, CORE_ADDR memaddr, @@ -605,10 +604,8 @@ mi_interp::on_breakpoint_created (breakpoint *b) gdb_flush (this->event_channel); } -/* Emit notification about deleted breakpoint. */ - -static void -mi_breakpoint_deleted (struct breakpoint *b) +void +mi_interp::on_breakpoint_deleted (breakpoint *b) { if (mi_suppress_notification.breakpoint) return; @@ -616,21 +613,11 @@ mi_breakpoint_deleted (struct breakpoint *b) if (b->number <= 0) return; - SWITCH_THRU_ALL_UIS () - { - struct mi_interp *mi = as_mi_interp (top_level_interpreter ()); - - if (mi == NULL) - continue; - - target_terminal::scoped_restore_terminal_state term_state; - target_terminal::ours_for_output (); - - gdb_printf (mi->event_channel, "breakpoint-deleted,id=\"%d\"", - b->number); + target_terminal::scoped_restore_terminal_state term_state; + target_terminal::ours_for_output (); - gdb_flush (mi->event_channel); - } + gdb_printf (this->event_channel, "breakpoint-deleted,id=\"%d\"", b->number); + gdb_flush (this->event_channel); } /* Emit notification about modified breakpoint. */ @@ -997,8 +984,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::breakpoint_deleted.attach (mi_breakpoint_deleted, - "mi-interp"); gdb::observers::breakpoint_modified.attach (mi_breakpoint_modified, "mi-interp"); gdb::observers::command_param_changed.attach (mi_command_param_changed, diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index bbd47422e962..61b8739b9b3c 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -67,6 +67,7 @@ class mi_interp final : public interp void on_tsv_deleted (const trace_state_variable *tsv) override; void on_tsv_modified (const trace_state_variable *tsv) override; void on_breakpoint_created (breakpoint *b) override; + void on_breakpoint_deleted (breakpoint *b) override; /* MI's output channels */ mi_console_file *out; -- 2.40.1