From e4239559f48767a4fe6778017908a96649330be5 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Fri, 21 Apr 2023 09:45:30 -0400
Subject: [PATCH] gdb: add interp::on_breakpoint_deleted method

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 847347fbb5a..76847f360ad 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -12316,6 +12316,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.  */
 
@@ -12371,7 +12380,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);
 
   breakpoint_chain.erase (breakpoint_chain.iterator_to (*bpt));
 
diff --git a/gdb/interps.c b/gdb/interps.c
index f8f97513ac6..dc36af64f4c 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 b1e2903e157..0e17b14735c 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -169,6 +169,9 @@ public:
   /* 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 398459cb9cf..02d2bc893b7 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,
@@ -606,10 +605,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;
@@ -617,21 +614,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.  */
@@ -998,8 +985,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 5e7ffdf0883..52c88a1c2b7 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -67,6 +67,7 @@ public:
   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.30.2