From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 09/30] gdb: add interp::on_command_error method
Date: Tue, 2 May 2023 16:49:49 -0400 [thread overview]
Message-ID: <20230502205011.132151-10-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com>
Same idea as the previous patches, but for command_error.
Change-Id: If6098225dd72fad8be13b3023b35bc8bc48efb9d
---
gdb/cli/cli-interp.c | 12 ++----------
gdb/cli/cli-interp.h | 1 +
gdb/interps.h | 4 ++++
gdb/main.c | 2 +-
gdb/mi/mi-interp.c | 11 +++--------
gdb/mi/mi-interp.h | 1 +
gdb/observable.c | 1 -
gdb/observable.h | 3 ---
8 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 00310542a8db..ffb40729fc61 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -158,15 +158,9 @@ cli_interp_base::on_sync_execution_done ()
display_gdb_prompt (NULL);
}
-/* Observer for the command_error notification. */
-
-static void
-cli_base_on_command_error ()
+void
+cli_interp_base::on_command_error ()
{
- cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ());
- if (cli == nullptr)
- return;
-
display_gdb_prompt (NULL);
}
@@ -355,8 +349,6 @@ _initialize_cli_interp ()
interp_factory_register (INTERP_CONSOLE, cli_interp_factory);
/* Note these all work for both the CLI and TUI interpreters. */
- gdb::observers::command_error.attach (cli_base_on_command_error,
- "cli-interp-base");
gdb::observers::user_selected_context_changed.attach
(cli_base_on_user_selected_context_changed, "cli-interp-base");
}
diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index 4680c8070fd0..5020b2bc6ef4 100644
--- a/gdb/cli/cli-interp.h
+++ b/gdb/cli/cli-interp.h
@@ -39,6 +39,7 @@ class cli_interp_base : public interp
void on_exited (int status) override;
void on_no_history () override;
void on_sync_execution_done () override;
+ void on_command_error () override;
private:
struct saved_output_files
diff --git a/gdb/interps.h b/gdb/interps.h
index 349ffb1bdcf7..53d951b8d637 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -106,6 +106,10 @@ class interp : public intrusive_list_node<interp>
finished. */
virtual void on_sync_execution_done () {}
+ /* Notify the interpreter that an error was caught while executing a
+ command on this interpreter. */
+ virtual void on_command_error () {}
+
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
diff --git a/gdb/main.c b/gdb/main.c
index 5c23714f52e0..47eec0e50730 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -430,7 +430,7 @@ start_event_loop ()
get around to resetting the prompt, which leaves readline
in a messed-up state. Reset it here. */
current_ui->prompt_state = PROMPT_NEEDED;
- gdb::observers::command_error.notify ();
+ top_level_interpreter ()->on_command_error ();
/* This call looks bizarre, but it is required. If the user
entered a command that caused an error,
after_char_processing_hook won't be called from
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 21c0fb6e73f7..45160571ce98 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -104,14 +104,10 @@ as_mi_interp (struct interp *interp)
return dynamic_cast<mi_interp *> (interp);
}
-/* Observer for the command_error notification. */
-
-static void
-mi_on_command_error ()
+void
+mi_interp::on_command_error ()
{
- mi_interp *mi = as_mi_interp (top_level_interpreter ());
- if (mi != nullptr)
- display_mi_prompt (mi);
+ display_mi_prompt (this);
}
void
@@ -1236,7 +1232,6 @@ _initialize_mi_interp ()
"mi-interp");
gdb::observers::command_param_changed.attach (mi_command_param_changed,
"mi-interp");
- gdb::observers::command_error.attach (mi_on_command_error, "mi-interp");
gdb::observers::memory_changed.attach (mi_memory_changed, "mi-interp");
gdb::observers::user_selected_context_changed.attach
(mi_user_selected_context_changed, "mi-interp");
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index 15ba8dab15bd..08edaceb99cd 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -48,6 +48,7 @@ class mi_interp final : public interp
void on_exited (int status) override;
void on_no_history () override;
void on_sync_execution_done () override;
+ void on_command_error () override;
/* MI's output channels */
mi_console_file *out;
diff --git a/gdb/observable.c b/gdb/observable.c
index f52989d7a638..bfb92b4fe15e 100644
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -34,7 +34,6 @@ bool observer_debug = false;
DEFINE_OBSERVABLE (normal_stop);
DEFINE_OBSERVABLE (signal_received);
-DEFINE_OBSERVABLE (command_error);
DEFINE_OBSERVABLE (target_changed);
DEFINE_OBSERVABLE (executable_changed);
DEFINE_OBSERVABLE (inferior_created);
diff --git a/gdb/observable.h b/gdb/observable.h
index 4be05efa0231..1ec927671e53 100644
--- a/gdb/observable.h
+++ b/gdb/observable.h
@@ -57,9 +57,6 @@ extern observable<struct bpstat */* bs */, int /* print_frame */> normal_stop;
/* The inferior was stopped by a signal. */
extern observable<enum gdb_signal /* siggnal */> signal_received;
-/* An error was caught while executing a command. */
-extern observable<> command_error;
-
/* The target's register contents have changed. */
extern observable<struct target_ops */* target */> target_changed;
--
2.40.1
next prev parent reply other threads:[~2023-05-02 20:52 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 20:49 [PATCH 00/30] Switch interpreters to use virtual methods Simon Marchi
2023-05-02 20:49 ` [PATCH 01/30] gdb/mi: fix ^running record with multiple MI interpreters Simon Marchi
2023-05-03 14:42 ` Alexandra Petlanova Hajkova
2023-05-03 15:02 ` Simon Marchi
2023-05-29 14:53 ` Simon Marchi
2023-05-02 20:49 ` [PATCH 02/30] gdb/mi: make current_token a field of mi_interp Simon Marchi
2023-05-04 12:31 ` Alexandra Petlanova Hajkova
2023-05-02 20:49 ` [PATCH 03/30] gdb: add interp::on_signal_received method Simon Marchi
2023-05-04 14:38 ` Alexandra Petlanova Hajkova
2023-05-02 20:49 ` [PATCH 04/30] gdb: add interp::on_normal_stop method Simon Marchi
2023-05-02 20:49 ` [PATCH 05/30] gdb: add interp::on_signal_exited method Simon Marchi
2023-05-02 20:49 ` [PATCH 06/30] gdb: add interp::on_exited method Simon Marchi
2023-05-02 20:49 ` [PATCH 07/30] gdb: add interp::on_no_history method Simon Marchi
2023-05-02 20:49 ` [PATCH 08/30] gdb: add interp::on_sync_execution_done method Simon Marchi
2023-05-02 20:49 ` Simon Marchi [this message]
2023-05-02 20:49 ` [PATCH 10/30] gdb: add interp::on_user_selected_context_changed method Simon Marchi
2023-05-02 20:49 ` [PATCH 11/30] gdb: add interp::on_new_thread method Simon Marchi
2023-05-02 20:49 ` [PATCH 12/30] gdb: add interp::on_thread_exited method Simon Marchi
2023-05-02 20:49 ` [PATCH 13/30] gdb: add interp::on_inferior_added method Simon Marchi
2023-05-02 20:49 ` [PATCH 14/30] gdb: add interp::on_inferior_appeared method Simon Marchi
2023-05-02 20:49 ` [PATCH 15/30] gdb: add interp::on_inferior_disappeared method Simon Marchi
2023-05-02 20:49 ` [PATCH 16/30] gdb: add interp::on_inferior_removed method Simon Marchi
2023-05-02 20:49 ` [PATCH 17/30] gdb: add interp::on_record_changed method Simon Marchi
2023-05-02 20:49 ` [PATCH 18/30] gdb: add interp::on_target_resumed method Simon Marchi
2023-05-02 20:49 ` [PATCH 19/30] gdb: add interp::on_solib_loaded method Simon Marchi
2023-05-02 20:50 ` [PATCH 20/30] gdb: add interp::on_solib_unloaded method Simon Marchi
2023-05-02 20:50 ` [PATCH 21/30] gdb: add interp::on_about_to_proceed method Simon Marchi
2023-05-02 20:50 ` [PATCH 22/30] gdb: add interp::on_traceframe_changed method Simon Marchi
2023-05-02 20:50 ` [PATCH 23/30] gdb: add interp::on_tsv_created method Simon Marchi
2023-05-02 20:50 ` [PATCH 24/30] gdb: add interp::on_tsv_deleted method Simon Marchi
2023-05-02 20:50 ` [PATCH 25/30] gdb: add interp::on_tsv_modified method Simon Marchi
2023-05-02 20:50 ` [PATCH 26/30] gdb: add interp::on_breakpoint_created method Simon Marchi
2023-05-02 20:50 ` [PATCH 27/30] gdb: add interp::on_breakpoint_deleted method Simon Marchi
2023-05-02 20:50 ` [PATCH 28/30] gdb: add interp::on_breakpoint_modified method Simon Marchi
2023-05-02 20:50 ` [PATCH 29/30] gdb: add interp::on_param_changed method Simon Marchi
2023-05-02 20:50 ` [PATCH 30/30] gdb: add interp::on_memory_changed method Simon Marchi
2023-05-02 20:50 ` [PATCH 00/30] Make interpreters use virtual methods (instead of observers) Simon Marchi
2023-05-23 12:43 ` [PATCH 00/30] Switch interpreters to use virtual methods Simon Marchi
2023-05-30 19:09 ` Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230502205011.132151-10-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).