diff options
-rw-r--r-- | gdb/cli/cli-interp.c | 17 | ||||
-rw-r--r-- | gdb/cli/cli-interp.h | 2 | ||||
-rw-r--r-- | gdb/infrun.c | 14 | ||||
-rw-r--r-- | gdb/infrun.h | 4 | ||||
-rw-r--r-- | gdb/interps.c | 23 | ||||
-rw-r--r-- | gdb/interps.h | 8 | ||||
-rw-r--r-- | gdb/mi/mi-interp.c | 20 | ||||
-rw-r--r-- | gdb/mi/mi-interp.h | 2 | ||||
-rw-r--r-- | gdb/remote.c | 2 |
9 files changed, 59 insertions, 33 deletions
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 84fe34a..51c78d9 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -137,19 +137,10 @@ cli_base_on_normal_stop (struct bpstat *bs, int print_frame) } } -/* Observer for the signal_received notification. */ - -static void -cli_base_on_signal_received (enum gdb_signal siggnal) +void +cli_interp_base::on_signal_received (enum gdb_signal siggnal) { - SWITCH_THRU_ALL_UIS () - { - cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ()); - if (cli == nullptr) - continue; - - print_signal_received_reason (cli->interp_ui_out (), siggnal); - } + print_signal_received_reason (this->interp_ui_out (), siggnal); } /* Observer for the signalled notification. */ @@ -408,8 +399,6 @@ _initialize_cli_interp () /* Note these all work for both the CLI and TUI interpreters. */ gdb::observers::normal_stop.attach (cli_base_on_normal_stop, "cli-interp-base"); - gdb::observers::signal_received.attach (cli_base_on_signal_received, - "cli-interp-base"); gdb::observers::signal_exited.attach (cli_base_on_signal_exited, "cli-interp-base"); gdb::observers::exited.attach (cli_base_on_exited, "cli-interp-base"); diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h index 5ed998f..f7bee45 100644 --- a/gdb/cli/cli-interp.h +++ b/gdb/cli/cli-interp.h @@ -33,6 +33,8 @@ public: void pre_command_loop () override; bool supports_command_editing () override; + void on_signal_received (gdb_signal sig) override; + private: struct saved_output_files { diff --git a/gdb/infrun.c b/gdb/infrun.c index a9e2a24..6a2973e 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -76,6 +76,7 @@ #include "gdbsupport/buildargv.h" #include "extension.h" #include "disasm.h" +#include "interps.h" /* Prototypes for local functions */ @@ -6264,6 +6265,15 @@ finish_step_over (struct execution_control_state *ecs) return 0; } +/* See infrun.h. */ + +void +notify_signal_received (gdb_signal sig) +{ + interps_notify_signal_received (sig); + gdb::observers::signal_received.notify (sig); +} + /* Come here when the program has stopped with a signal. */ static void @@ -6687,7 +6697,7 @@ handle_signal_stop (struct execution_control_state *ecs) { /* The signal table tells us to print about this signal. */ target_terminal::ours_for_output (); - gdb::observers::signal_received.notify (ecs->event_thread->stop_signal ()); + notify_signal_received (ecs->event_thread->stop_signal ()); target_terminal::inferior (); } @@ -8829,7 +8839,7 @@ normal_stop () update_thread_list (); if (last.kind () == TARGET_WAITKIND_STOPPED && stopped_by_random_signal) - gdb::observers::signal_received.notify (inferior_thread ()->stop_signal ()); + notify_signal_received (inferior_thread ()->stop_signal ()); /* As with the notification of thread events, we want to delay notifying the user that we've switched thread context until diff --git a/gdb/infrun.h b/gdb/infrun.h index 9513bc5..f7b60a4 100644 --- a/gdb/infrun.h +++ b/gdb/infrun.h @@ -210,6 +210,10 @@ extern void set_step_info (thread_info *tp, frame_info_ptr frame, struct symtab_and_line sal); +/* Notify interpreters and observers that the current inferior has stopped with + signal SIG. */ +extern void notify_signal_received (gdb_signal sig); + /* Several print_*_reason helper functions to print why the inferior has stopped to the passed in UIOUT. */ diff --git a/gdb/interps.c b/gdb/interps.c index e3f6ee6..5d061ad 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -383,6 +383,29 @@ current_interpreter (void) return current_ui->current_interpreter; } +/* Helper interps_notify_* functions. Call METHOD on the top-level interpreter + of all UIs. */ + +template <typename ...Args> +void +interps_notify (void (interp::*method) (Args...), Args... args) +{ + SWITCH_THRU_ALL_UIS () + { + interp *tli = top_level_interpreter (); + if (tli != nullptr) + (tli->*method) (args...); + } +} + +/* See interps.h. */ + +void +interps_notify_signal_received (gdb_signal sig) +{ + interps_notify (&interp::on_signal_received, sig); +} + /* This just adds the "interpreter-exec" command. */ void _initialize_interpreter (); void diff --git a/gdb/interps.h b/gdb/interps.h index da78a5d..4762c4c 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -82,6 +82,10 @@ public: const char *name () const { return m_name; } + /* Notify the interpreter that the current inferior has stopped with signal + SIG. */ + virtual void on_signal_received (gdb_signal sig) {} + private: /* The memory for this is static, it comes from literal strings (e.g. "cli"). */ const char *m_name; @@ -170,6 +174,10 @@ extern void interpreter_completer (struct cmd_list_element *ignore, const char *text, const char *word); +/* Notify all interpreters that the current inferior has stopped with signal + SIG. */ +extern void interps_notify_signal_received (gdb_signal sig); + /* 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 d8b49ae..b77494e 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_on_signal_received (enum gdb_signal siggnal); static void mi_on_signal_exited (enum gdb_signal siggnal); static void mi_on_exited (int exitstatus); static void mi_on_normal_stop (struct bpstat *bs, int print_frame); @@ -525,21 +524,11 @@ find_mi_interp (void) inferior has stopped to both the MI event channel and to the MI console. If the MI interpreter is not active, print nothing. */ -/* Observer for the signal_received notification. */ - -static void -mi_on_signal_received (enum gdb_signal siggnal) +void +mi_interp::on_signal_received (enum gdb_signal siggnal) { - SWITCH_THRU_ALL_UIS () - { - struct mi_interp *mi = find_mi_interp (); - - if (mi == NULL) - continue; - - print_signal_received_reason (mi->mi_uiout, siggnal); - print_signal_received_reason (mi->cli_uiout, siggnal); - } + print_signal_received_reason (this->mi_uiout, siggnal); + print_signal_received_reason (this->cli_uiout, siggnal); } /* Observer for the signal_exited notification. */ @@ -1304,7 +1293,6 @@ _initialize_mi_interp () interp_factory_register (INTERP_MI4, mi_interp_factory); interp_factory_register (INTERP_MI, mi_interp_factory); - gdb::observers::signal_received.attach (mi_on_signal_received, "mi-interp"); gdb::observers::signal_exited.attach (mi_on_signal_exited, "mi-interp"); gdb::observers::exited.attach (mi_on_exited, "mi-interp"); gdb::observers::no_history.attach (mi_on_no_history, "mi-interp"); diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h index eb81cbe..a8fd7b6 100644 --- a/gdb/mi/mi-interp.h +++ b/gdb/mi/mi-interp.h @@ -42,6 +42,8 @@ public: bool debug_redirect) override; void pre_command_loop () override; + void on_signal_received (gdb_signal sig) override; + /* MI's output channels */ mi_console_file *out; mi_console_file *err; diff --git a/gdb/remote.c b/gdb/remote.c index f7d5758..0d82d0f 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -4720,7 +4720,7 @@ remote_target::print_one_stopped_thread (thread_info *thread) enum gdb_signal sig = ws.sig (); if (signal_print_state (sig)) - gdb::observers::signal_received.notify (sig); + notify_signal_received (sig); } gdb::observers::normal_stop.notify (NULL, 1); } |