mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-10-17 04:43:17 +08:00
Remove make_cleanup_restore_target_terminal
This removes make_cleanup_restore_target_terminal and generally C++-ifies target terminal handling. It changes all target_terminal_* functions to be static members of a new target_terminal class and changes the cleanup to be a scoped_* class. make_cleanup_override_quit_handler is also removed in favor of simply using scoped_restore. Note that there are some files in this patch that I could not compile. Considering that some of the rewrites were automated, and that none of these files involed cleanups, I feel that this is relatively safe. Regression tested by the buildbot. gdb/ChangeLog 2017-09-20 Tom Tromey <tom@tromey.com> * windows-nat.c (get_windows_debug_event, windows_wait) (do_initial_windows_stuff, windows_attach): Update. * utils.c (vwarning, internal_vproblem): Update. (ui_unregister_input_event_handler_cleanup) (prepare_to_handle_input): Remove. (class scoped_input_handler): New. (defaulted_query, prompt_for_continue): Update. * tui/tui-hooks.c (tui_refresh_frame_and_register_information): Update. * top.c (undo_terminal_modifications_before_exit): Update. * target/target.h (target_terminal_init, target_terminal_inferior) (target_terminal_ours): Don't declare. (class target_terminal): New. * target.h (target_terminal_is_inferior, target_terminal_is_ours) (target_terminal_ours_for_output) (make_cleanup_restore_target_terminal): Don't declare. (target_terminal_info): Remove. * target.c (enum terminal_state, terminal_state): Remove. (target_terminal::terminal_state): Define. (target_terminal::init): Rename from target_terminal_init. (target_terminal::inferior): Rename from target_terminal_inferior. (target_terminal::ours): Rename from target_terminal_ours. (target_terminal::ours_for_output): Rename from target_terminal_ours_for_output. (target_terminal::info): New method. (cleanup_restore_target_terminal) (make_cleanup_restore_target_terminal): Remove. * solib.c (handle_solib_event): Update. * remote.c (remote_serial_quit_handler): Update. (remote_terminal_inferior, remote_wait_as): Update. * record-full.c (record_full_wait_1): Update. * nto-procfs.c (procfs_create_inferior): Update. * nat/fork-inferior.c (startup_inferior): Update. * mi/mi-interp.c (mi_new_thread, mi_thread_exit) (mi_record_changed, mi_inferior_added, mi_inferior_appeared) (mi_inferior_exit, mi_inferior_removed, mi_traceframe_changed) (mi_tsv_created, mi_tsv_deleted, mi_tsv_modified) (mi_breakpoint_created, mi_breakpoint_deleted) (mi_breakpoint_modified, mi_on_resume, mi_solib_loaded) (mi_solib_unloaded, mi_command_param_changed, mi_memory_changed) (mi_user_selected_context_changed, report_initial_inferior): Update. * linux-nat.c (linux_nat_attach, linux_nat_terminal_ours) (linux_nat_terminal_inferior): Update. * infrun.c (follow_fork_inferior) (handle_vfork_child_exec_or_exit, do_target_resume) (check_curr_ui_sync_execution_done, handle_inferior_event_1) (handle_signal_stop, maybe_remove_breakpoints, normal_stop): Update. * inflow.c (child_terminal_init, info_terminal_command): Update. * infcmd.c (post_create_inferior, continue_1, prepare_one_step) (attach_command): Update. * infcall.c (call_thread_fsm_should_stop): Update. * gnu-nat.c (gnu_attach): Update. * extension.c (struct active_ext_lang_state) (restore_active_ext_lang): Update. * exceptions.c (print_flush): Update. * event-top.c (async_enable_stdin, default_quit_handler): Update. (struct quit_handler_cleanup_data, restore_quit_handler) (restore_quit_handler_dtor, make_cleanup_override_quit_handler): Remove. * cp-support.c (gdb_demangle): Update. * breakpoint.c (update_inserted_breakpoint_locations) (insert_breakpoint_locations, handle_jit_event) (disable_breakpoints_in_unloaded_shlib): Update. * annotate.c (annotate_breakpoints_invalid) (annotate_frames_invalid): Update. gdb/gdbserver/ChangeLog 2017-09-20 Tom Tromey <tom@tromey.com> * target.c (target_terminal::terminal_state): Define. (target_terminal::init): Rename from target_terminal_init. (target_terminal::inferior): Rename from target_terminal_inferior. (target_terminal::ours): Rename from target_terminal_ours. (target_terminal::ours_for_output, target_terminal::info): New.
This commit is contained in:
Tom Tromey
80
gdb/utils.c
80
gdb/utils.c
@ -67,6 +67,7 @@
|
||||
#include "gdb_regex.h"
|
||||
#include "job-control.h"
|
||||
#include "common/selftest.h"
|
||||
#include "common/gdb_optional.h"
|
||||
|
||||
#if !HAVE_DECL_MALLOC
|
||||
extern PTR malloc (); /* ARI: PTR */
|
||||
@ -276,12 +277,11 @@ vwarning (const char *string, va_list args)
|
||||
(*deprecated_warning_hook) (string, args);
|
||||
else
|
||||
{
|
||||
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
|
||||
|
||||
gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;
|
||||
if (target_supports_terminal_ours ())
|
||||
{
|
||||
make_cleanup_restore_target_terminal ();
|
||||
target_terminal_ours_for_output ();
|
||||
term_state.emplace ();
|
||||
target_terminal::ours_for_output ();
|
||||
}
|
||||
if (filtered_printing_initialized ())
|
||||
wrap_here (""); /* Force out any buffered output. */
|
||||
@ -290,8 +290,6 @@ vwarning (const char *string, va_list args)
|
||||
fputs_unfiltered (warning_pre_print, gdb_stderr);
|
||||
vfprintf_unfiltered (gdb_stderr, string, args);
|
||||
fprintf_unfiltered (gdb_stderr, "\n");
|
||||
|
||||
do_cleanups (old_chain);
|
||||
}
|
||||
}
|
||||
|
||||
@ -485,10 +483,11 @@ internal_vproblem (struct internal_problem *problem,
|
||||
}
|
||||
|
||||
/* Try to get the message out and at the start of a new line. */
|
||||
gdb::optional<target_terminal::scoped_restore_terminal_state> term_state;
|
||||
if (target_supports_terminal_ours ())
|
||||
{
|
||||
make_cleanup_restore_target_terminal ();
|
||||
target_terminal_ours_for_output ();
|
||||
term_state.emplace ();
|
||||
target_terminal::ours_for_output ();
|
||||
}
|
||||
if (filtered_printing_initialized ())
|
||||
begin_line ();
|
||||
@ -897,32 +896,43 @@ make_hex_string (const gdb_byte *data, size_t length)
|
||||
|
||||
|
||||
|
||||
/* A cleanup that simply calls ui_unregister_input_event_handler. */
|
||||
/* An RAII class that sets up to handle input and then tears down
|
||||
during destruction. */
|
||||
|
||||
static void
|
||||
ui_unregister_input_event_handler_cleanup (void *ui)
|
||||
class scoped_input_handler
|
||||
{
|
||||
ui_unregister_input_event_handler ((struct ui *) ui);
|
||||
}
|
||||
public:
|
||||
|
||||
/* Set up to handle input. */
|
||||
scoped_input_handler ()
|
||||
: m_quit_handler (make_scoped_restore (&quit_handler,
|
||||
default_quit_handler)),
|
||||
m_ui (NULL)
|
||||
{
|
||||
target_terminal::ours ();
|
||||
ui_register_input_event_handler (current_ui);
|
||||
if (current_ui->prompt_state == PROMPT_BLOCKED)
|
||||
m_ui = current_ui;
|
||||
}
|
||||
|
||||
static struct cleanup *
|
||||
prepare_to_handle_input (void)
|
||||
{
|
||||
struct cleanup *old_chain;
|
||||
~scoped_input_handler ()
|
||||
{
|
||||
if (m_ui != NULL)
|
||||
ui_unregister_input_event_handler (m_ui);
|
||||
}
|
||||
|
||||
old_chain = make_cleanup_restore_target_terminal ();
|
||||
target_terminal_ours ();
|
||||
DISABLE_COPY_AND_ASSIGN (scoped_input_handler);
|
||||
|
||||
ui_register_input_event_handler (current_ui);
|
||||
if (current_ui->prompt_state == PROMPT_BLOCKED)
|
||||
make_cleanup (ui_unregister_input_event_handler_cleanup, current_ui);
|
||||
private:
|
||||
|
||||
make_cleanup_override_quit_handler (default_quit_handler);
|
||||
/* Save and restore the terminal state. */
|
||||
target_terminal::scoped_restore_terminal_state m_term_state;
|
||||
|
||||
return old_chain;
|
||||
}
|
||||
/* Save and restore the quit handler. */
|
||||
scoped_restore m_quit_handler;
|
||||
|
||||
/* The saved UI, if non-NULL. */
|
||||
struct ui *m_ui;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -987,9 +997,8 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
|
||||
/* Restrict queries to the main UI. */
|
||||
|| current_ui != main_ui)
|
||||
{
|
||||
old_chain = make_cleanup_restore_target_terminal ();
|
||||
|
||||
target_terminal_ours_for_output ();
|
||||
target_terminal::scoped_restore_terminal_state term_state;
|
||||
target_terminal::ours_for_output ();
|
||||
wrap_here ("");
|
||||
vfprintf_filtered (gdb_stdout, ctlstr, args);
|
||||
|
||||
@ -998,18 +1007,13 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
|
||||
y_string, n_string, def_answer);
|
||||
gdb_flush (gdb_stdout);
|
||||
|
||||
do_cleanups (old_chain);
|
||||
return def_value;
|
||||
}
|
||||
|
||||
if (deprecated_query_hook)
|
||||
{
|
||||
int res;
|
||||
|
||||
old_chain = make_cleanup_restore_target_terminal ();
|
||||
res = deprecated_query_hook (ctlstr, args);
|
||||
do_cleanups (old_chain);
|
||||
return res;
|
||||
target_terminal::scoped_restore_terminal_state term_state;
|
||||
return deprecated_query_hook (ctlstr, args);
|
||||
}
|
||||
|
||||
/* Format the question outside of the loop, to avoid reusing args. */
|
||||
@ -1026,7 +1030,7 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
|
||||
using namespace std::chrono;
|
||||
steady_clock::time_point prompt_started = steady_clock::now ();
|
||||
|
||||
prepare_to_handle_input ();
|
||||
scoped_input_handler prepare_input;
|
||||
|
||||
while (1)
|
||||
{
|
||||
@ -1590,7 +1594,7 @@ prompt_for_continue (void)
|
||||
beyond the end of the screen. */
|
||||
reinitialize_more_filter ();
|
||||
|
||||
prepare_to_handle_input ();
|
||||
scoped_input_handler prepare_input;
|
||||
|
||||
/* Call gdb_readline_wrapper, not readline, in order to keep an
|
||||
event loop running. */
|
||||
|
||||
Reference in New Issue
Block a user