From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 08/30] gdb: add interp::on_sync_execution_done method
Date: Tue, 2 May 2023 16:49:48 -0400 [thread overview]
Message-ID: <20230502205011.132151-9-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230502205011.132151-1-simon.marchi@efficios.com>
Same as previous patches, but for sync_execution_done. Except that
here, we only want to notify the interpreter that is executing the
command, not all interpreters.
Change-Id: I729c719447b5c5f29af65dbf6fed9132e2cd308b
---
gdb/cli/cli-interp.c | 12 ++----------
gdb/cli/cli-interp.h | 1 +
gdb/infrun.c | 2 +-
gdb/interps.h | 4 ++++
gdb/mi/mi-interp.c | 16 +++-------------
gdb/mi/mi-interp.h | 1 +
gdb/observable.c | 1 -
gdb/observable.h | 3 ---
8 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 98bc2033f2c6..00310542a8db 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -152,15 +152,9 @@ cli_interp_base::on_no_history ()
print_no_history_reason (this->interp_ui_out ());
}
-/* Observer for the sync_execution_done notification. */
-
-static void
-cli_base_on_sync_execution_done ()
+void
+cli_interp_base::on_sync_execution_done ()
{
- cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ());
- if (cli == nullptr)
- return;
-
display_gdb_prompt (NULL);
}
@@ -361,8 +355,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::sync_execution_done.attach (cli_base_on_sync_execution_done,
- "cli-interp-base");
gdb::observers::command_error.attach (cli_base_on_command_error,
"cli-interp-base");
gdb::observers::user_selected_context_changed.attach
diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index 7fc22a042d73..4680c8070fd0 100644
--- a/gdb/cli/cli-interp.h
+++ b/gdb/cli/cli-interp.h
@@ -38,6 +38,7 @@ class cli_interp_base : public interp
void on_normal_stop (bpstat *bs, int print_frame) override;
void on_exited (int status) override;
void on_no_history () override;
+ void on_sync_execution_done () override;
private:
struct saved_output_files
diff --git a/gdb/infrun.c b/gdb/infrun.c
index f86ec7a2ed81..8d648cf04f0a 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -4206,7 +4206,7 @@ check_curr_ui_sync_execution_done (void)
&& !gdb_in_secondary_prompt_p (ui))
{
target_terminal::ours ();
- gdb::observers::sync_execution_done.notify ();
+ top_level_interpreter ()->on_sync_execution_done ();
ui->register_file_handler ();
}
}
diff --git a/gdb/interps.h b/gdb/interps.h
index 915a5f74eb73..349ffb1bdcf7 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -102,6 +102,10 @@ class interp : public intrusive_list_node<interp>
execution because there is no more history. */
virtual void on_no_history () {}
+ /* Notify the interpreter that a synchronous command it started has
+ finished. */
+ virtual void on_sync_execution_done () {}
+
private:
/* The memory for this is static, it comes from literal strings (e.g. "cli"). */
const char *m_name;
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index a147c46ecf3b..21c0fb6e73f7 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -82,7 +82,6 @@ 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,
ssize_t len, const bfd_byte *myaddr);
-static void mi_on_sync_execution_done (void);
/* Display the MI prompt. */
@@ -268,20 +267,13 @@ mi_execute_command_wrapper (const char *cmd)
mi_execute_command (cmd, ui->instream == ui->stdin_stream);
}
-/* Observer for the synchronous_command_done notification. */
-
-static void
-mi_on_sync_execution_done (void)
+void
+mi_interp::on_sync_execution_done ()
{
- struct mi_interp *mi = as_mi_interp (top_level_interpreter ());
-
- if (mi == NULL)
- return;
-
/* If MI is sync, then output the MI prompt now, indicating we're
ready for further input. */
if (!mi_async_p ())
- display_mi_prompt (mi);
+ display_mi_prompt (this);
}
/* mi_execute_command_wrapper wrapper suitable for INPUT_HANDLER. */
@@ -1246,8 +1238,6 @@ _initialize_mi_interp ()
"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::sync_execution_done.attach (mi_on_sync_execution_done,
- "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 aeebc3207526..15ba8dab15bd 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -47,6 +47,7 @@ class mi_interp final : public interp
void on_normal_stop (struct bpstat *bs, int print_frame) override;
void on_exited (int status) override;
void on_no_history () override;
+ void on_sync_execution_done () override;
/* MI's output channels */
mi_console_file *out;
diff --git a/gdb/observable.c b/gdb/observable.c
index 502e2d988cd1..f52989d7a638 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 (sync_execution_done);
DEFINE_OBSERVABLE (command_error);
DEFINE_OBSERVABLE (target_changed);
DEFINE_OBSERVABLE (executable_changed);
diff --git a/gdb/observable.h b/gdb/observable.h
index b06d13be0362..4be05efa0231 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;
-/* A synchronous command finished. */
-extern observable<> sync_execution_done;
-
/* An error was caught while executing a command. */
extern observable<> command_error;
--
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 ` Simon Marchi [this message]
2023-05-02 20:49 ` [PATCH 09/30] gdb: add interp::on_command_error method Simon Marchi
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-9-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).