diff options
author | Tom Tromey <tom@tromey.com> | 2016-09-24 16:11:14 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2016-10-21 14:17:34 -0600 |
commit | 0e454242cc1527e49ad0ea795614ac94a083b68a (patch) | |
tree | 496037f8b3077158d566d6506b6ac642bbb40281 /gdb/infrun.c | |
parent | 8dddcb8f005e8470312bf33041bb6ddaa5084e32 (diff) | |
download | gdb-0e454242cc1527e49ad0ea795614ac94a083b68a.zip gdb-0e454242cc1527e49ad0ea795614ac94a083b68a.tar.gz gdb-0e454242cc1527e49ad0ea795614ac94a083b68a.tar.bz2 |
Remove make_cleanup_restore_current_ui
This removes make_cleanup_restore_current_ui by converting the last
use. The last use was in a few functions used to iterate over all
UIs. This patch replaces these functions with a class, and arranges
for the class destructor to do the needed cleanup.
2016-10-21 Tom Tromey <tom@tromey.com>
* tui/tui-interp.c (tui_on_normal_stop, tui_on_signal_received)
(tui_on_end_stepping_range, tui_on_signal_exited, tui_on_exited)
(tui_on_no_history, tui_on_user_selected_context_changed):
Update.
* top.h (switch_thru_all_uis): New class.
(SWITCH_THRU_ALL_UIS): Rewrite.
(make_cleanup_restore_current_ui, switch_thru_all_uis_init)
(switch_thru_all_uis_cond, switch_thru_all_uis_next): Don't
declare.
* 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_on_signal_received)
(mi_on_end_stepping_range, mi_on_signal_exited, mi_on_exited)
(mi_on_no_history, mi_on_normal_stop, mi_traceframe_changed)
(mi_tsv_created, mi_tsv_deleted, mi_tsv_modified)
(mi_breakpoint_created, mi_breakpoint_deleted)
(mi_breakpoint_modified, mi_output_running_pid, mi_on_resume)
(mi_solib_loaded, mi_solib_unloaded, mi_command_param_changed)
(mi_memory_changed, mi_user_selected_context_changed): Update.
* infrun.c (all_uis_check_sync_execution_done)
(all_uis_on_sync_execution_starting, normal_stop): Update.
* event-top.c (restore_ui_cleanup)
(make_cleanup_restore_current_ui, switch_thru_all_uis_init)
(switch_thru_all_uis_cond, switch_thru_all_uis_next): Remove.
* cli/cli-interp.c (cli_on_normal_stop, cli_on_signal_received)
(cli_on_end_stepping_range, cli_on_signal_exited, cli_on_exited)
(cli_on_no_history, cli_on_user_selected_context_changed):
Update.
* breakpoint.c (watchpoint_check): Update.
Diffstat (limited to 'gdb/infrun.c')
-rw-r--r-- | gdb/infrun.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 8d81c97..3069b2d 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3857,9 +3857,7 @@ check_curr_ui_sync_execution_done (void) void all_uis_check_sync_execution_done (void) { - struct switch_thru_all_uis state; - - SWITCH_THRU_ALL_UIS (state) + SWITCH_THRU_ALL_UIS () { check_curr_ui_sync_execution_done (); } @@ -3870,9 +3868,7 @@ all_uis_check_sync_execution_done (void) void all_uis_on_sync_execution_starting (void) { - struct switch_thru_all_uis state; - - SWITCH_THRU_ALL_UIS (state) + SWITCH_THRU_ALL_UIS () { if (current_ui->prompt_state == PROMPT_NEEDED) async_disable_stdin (); @@ -8217,7 +8213,6 @@ normal_stop (void) ptid_t last_ptid; struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); ptid_t pid_ptid; - struct switch_thru_all_uis state; get_last_target_status (&last_ptid, &last); @@ -8282,7 +8277,7 @@ normal_stop (void) && last.kind != TARGET_WAITKIND_EXITED && last.kind != TARGET_WAITKIND_NO_RESUMED) { - SWITCH_THRU_ALL_UIS (state) + SWITCH_THRU_ALL_UIS () { target_terminal_ours_for_output (); printf_filtered (_("[Switching to %s]\n"), @@ -8294,7 +8289,7 @@ normal_stop (void) if (last.kind == TARGET_WAITKIND_NO_RESUMED) { - SWITCH_THRU_ALL_UIS (state) + SWITCH_THRU_ALL_UIS () if (current_ui->prompt_state == PROMPT_BLOCKED) { target_terminal_ours_for_output (); @@ -8311,7 +8306,7 @@ normal_stop (void) if (stopped_by_random_signal) disable_current_display (); - SWITCH_THRU_ALL_UIS (state) + SWITCH_THRU_ALL_UIS () { async_enable_stdin (); } |