aboutsummaryrefslogtreecommitdiff
path: root/gdb/target.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2016-08-09 22:45:40 +0100
committerPedro Alves <palves@redhat.com>2016-08-09 22:50:45 +0100
commit3eb7562a983bab4c768983bcd85708852d171121 (patch)
tree9ceb489cbd1f48967e11a4a60d1f34d9b57ec007 /gdb/target.c
parent80614914274f7166baea2ec656aec6a949869324 (diff)
Fix PR gdb/20418 - Problems with synchronous commands and new-ui
When executing commands on a secondary UI running the MI interpreter, some commands that should be synchronous are not. MI incorrectly continues processing input right after the synchronous command is sent, before the target stops. The problem happens when we emit MI async events (=library-loaded, etc.), and we go about restoring the previous terminal state, we end up calling target_terminal_ours, which incorrectly always installs the current UI's input_fd in the event loop... That is, code like this: old_chain = make_cleanup_restore_target_terminal (); target_terminal_ours_for_output (); fprintf_unfiltered (mi->event_channel, "library-loaded"); ... do_cleanups (old_chain); The fix is to move the add_file_handler/delete_file_handler calls out of target_terminal_$foo, making these completely no-ops unless called with the main UI as current UI. gdb/ChangeLog: 2016-08-09 Pedro Alves <palves@redhat.com> PR gdb/20418 * event-top.c (ui_register_input_event_handler) (ui_unregister_input_event_handler): New functions. (async_enable_stdin): Register input in the event loop. (async_disable_stdin): Unregister input from the event loop. (gdb_setup_readline): Register input in the event loop. * infrun.c (check_curr_ui_sync_execution_done): Register input in the event loop. * target.c (target_terminal_inferior): Don't unregister input from the event loop. (target_terminal_ours): Don't register input in the event loop. * target.h (target_terminal_inferior) (target_terminal_ours_for_output, target_terminal_ours): Update comments. * top.h (ui_register_input_event_handler) (ui_unregister_input_event_handler): New declarations. * utils.c (ui_unregister_input_event_handler_cleanup) (prepare_to_handle_input): New functions. (defaulted_query, prompt_for_continue): Use prepare_to_handle_input. gdb/testsuite/ChangeLog: 2016-08-09 Pedro Alves <palves@redhat.com> Simon Marchi <simon.marchi@ericsson.com> PR gdb/20418 * gdb.mi/new-ui-mi-sync.c, gdb.mi/new-ui-mi-sync.exp: New files. * lib/mi-support.exp (mi_expect_interrupt): Remove anchors.
Diffstat (limited to 'gdb/target.c')
-rw-r--r--gdb/target.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/gdb/target.c b/gdb/target.c
index 622836135f..5603d0193d 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -486,15 +486,9 @@ target_terminal_inferior (void)
if (ui->prompt_state != PROMPT_BLOCKED)
return;
- /* Always delete the current UI's input file handler, regardless of
- terminal_state, because terminal_state is only valid for the main
- UI. */
- delete_file_handler (ui->input_fd);
-
/* Since we always run the inferior in the main console (unless "set
inferior-tty" is in effect), when some UI other than the main one
calls target_terminal_inferior/target_terminal_inferior, then we
- only register/unregister the UI's input from the event loop, but
leave the main UI's terminal settings as is. */
if (ui != main_ui)
return;
@@ -520,11 +514,6 @@ target_terminal_ours (void)
{
struct ui *ui = current_ui;
- /* Always add the current UI's input file handler, regardless of
- terminal_state, because terminal_state is only valid for the main
- UI. */
- add_file_handler (ui->input_fd, stdin_event_handler, ui);
-
/* See target_terminal_inferior. */
if (ui != main_ui)
return;