7 files changed, 29 insertions, 29 deletions

diff --git a/gdb/interps.c b/gdb/interps.c
index 9d736fc..c8d4fbd 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -543,6 +543,14 @@ interps_notify_tsv_created (const trace_state_variable *tsv)
   interps_notify (&interp::on_tsv_created, tsv);
 }
 
+/* See interps.h.  */
+
+void
+interps_notify_tsv_deleted (const trace_state_variable *tsv)
+{
+  interps_notify (&interp::on_tsv_deleted, tsv);
+}
+
 /* This just adds the "interpreter-exec" command.  */
 void _initialize_interpreter ();
 void
diff --git a/gdb/interps.h b/gdb/interps.h
index de1af07..7e76137 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -160,6 +160,9 @@ public:
   /* Notify the interpreter that trace state variable TSV was created.  */
   virtual void on_tsv_created (const trace_state_variable *tsv) {}
 
+  /* Notify the interpreter that trace state variable TSV was deleted.  */
+  virtual void on_tsv_deleted (const trace_state_variable *tsv) {}
+
 private:
   /* The memory for this is static, it comes from literal strings (e.g. "cli").  */
   const char *m_name;
@@ -321,6 +324,11 @@ extern void interps_notify_traceframe_changed (int tfnum, int tpnum);
 /* Notify all interpreters that trace state variable TSV was created.  */
 extern void interps_notify_tsv_created (const trace_state_variable *tsv);
 
+/* Notify all interpreters that trace state variable TSV was deleted.
+   
+   If TSV is nullptr, it means that all trace state variables were deleted.  */
+extern void interps_notify_tsv_deleted (const trace_state_variable *tsv);
+
 /* 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 f5a2053..afcd867 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_tsv_deleted (const struct trace_state_variable *tsv);
 static void mi_tsv_modified (const struct trace_state_variable *tsv);
 static void mi_breakpoint_created (struct breakpoint *b);
 static void mi_breakpoint_deleted (struct breakpoint *b);
@@ -525,29 +524,19 @@ mi_interp::on_tsv_created (const trace_state_variable *tsv)
   gdb_flush (this->event_channel);
 }
 
-/* Emit notification on deleting a trace state variable.  */
-
-static void
-mi_tsv_deleted (const struct trace_state_variable *tsv)
+void
+mi_interp::on_tsv_deleted (const trace_state_variable *tsv)
 {
-  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 ();
+  target_terminal::scoped_restore_terminal_state term_state;
+  target_terminal::ours_for_output ();
 
-      if (tsv != NULL)
-	gdb_printf (mi->event_channel, "tsv-deleted,"
-		    "name=\"%s\"", tsv->name.c_str ());
-      else
-	gdb_printf (mi->event_channel, "tsv-deleted");
+  if (tsv != nullptr)
+    gdb_printf (this->event_channel, "tsv-deleted,name=\"%s\"",
+		tsv->name.c_str ());
+  else
+    gdb_printf (this->event_channel, "tsv-deleted");
 
-      gdb_flush (mi->event_channel);
-    }
+  gdb_flush (this->event_channel);
 }
 
 /* Emit notification on modifying a trace state variable.  */
@@ -1033,7 +1022,6 @@ _initialize_mi_interp ()
   interp_factory_register (INTERP_MI4, mi_interp_factory);
   interp_factory_register (INTERP_MI, mi_interp_factory);
 
-  gdb::observers::tsv_deleted.attach (mi_tsv_deleted, "mi-interp");
   gdb::observers::tsv_modified.attach (mi_tsv_modified, "mi-interp");
   gdb::observers::breakpoint_created.attach (mi_breakpoint_created,
 					     "mi-interp");
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index 169f107..604be7e 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -64,6 +64,7 @@ public:
   void on_about_to_proceed () override;
   void on_traceframe_changed (int tfnum, int tpnum) override;
   void on_tsv_created (const trace_state_variable *tsv) override;
+  void on_tsv_deleted (const trace_state_variable *tsv) override;
 
   /* MI's output channels */
   mi_console_file *out;
diff --git a/gdb/observable.c b/gdb/observable.c
index 0715b6e..f70dcef 100644
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -62,7 +62,6 @@ DEFINE_OBSERVABLE (memory_changed);
 DEFINE_OBSERVABLE (before_prompt);
 DEFINE_OBSERVABLE (gdb_datadir_changed);
 DEFINE_OBSERVABLE (command_param_changed);
-DEFINE_OBSERVABLE (tsv_deleted);
 DEFINE_OBSERVABLE (tsv_modified);
 DEFINE_OBSERVABLE (inferior_call_pre);
 DEFINE_OBSERVABLE (inferior_call_post);
diff --git a/gdb/observable.h b/gdb/observable.h
index 46a0279..326c49a 100644
--- a/gdb/observable.h
+++ b/gdb/observable.h
@@ -190,10 +190,6 @@ extern observable<> gdb_datadir_changed;
 extern observable<const char */* param */, const char */* value */>
     command_param_changed;
 
-/* The trace state variable TSV is deleted.  If TSV is NULL, all
-   trace state variables are deleted.  */
-extern observable<const struct trace_state_variable */* tsv */> tsv_deleted;
-
 /* The trace state value TSV is modified.  */
 extern observable<const struct trace_state_variable */* tsv */> tsv_modified;
 
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 3d925bf..cf8fac3 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -289,7 +289,7 @@ delete_trace_state_variable (const char *name)
   for (auto it = tvariables.begin (); it != tvariables.end (); it++)
     if (it->name == name)
       {
-	gdb::observers::tsv_deleted.notify (&*it);
+	interps_notify_tsv_deleted (&*it);
 	tvariables.erase (it);
 	return;
       }
@@ -388,7 +388,7 @@ delete_trace_variable_command (const char *args, int from_tty)
       if (query (_("Delete all trace state variables? ")))
 	tvariables.clear ();
       dont_repeat ();
-      gdb::observers::tsv_deleted.notify (NULL);
+      interps_notify_tsv_deleted (nullptr);
       return;
     }