diff options
author | Pedro Alves <palves@redhat.com> | 2016-08-09 22:45:40 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-08-09 22:50:45 +0100 |
commit | 3eb7562a983bab4c768983bcd85708852d171121 (patch) | |
tree | 9ceb489cbd1f48967e11a4a60d1f34d9b57ec007 /gdb/event-top.c | |
parent | 80614914274f7166baea2ec656aec6a949869324 (diff) | |
download | gdb-3eb7562a983bab4c768983bcd85708852d171121.zip gdb-3eb7562a983bab4c768983bcd85708852d171121.tar.gz gdb-3eb7562a983bab4c768983bcd85708852d171121.tar.bz2 |
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/event-top.c')
-rw-r--r-- | gdb/event-top.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/gdb/event-top.c b/gdb/event-top.c index 072ad2a..91b06e6 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -550,6 +550,22 @@ stdin_event_handler (int error, gdb_client_data client_data) } } +/* See top.h. */ + +void +ui_register_input_event_handler (struct ui *ui) +{ + add_file_handler (ui->input_fd, stdin_event_handler, ui); +} + +/* See top.h. */ + +void +ui_unregister_input_event_handler (struct ui *ui) +{ + delete_file_handler (ui->input_fd); +} + /* Re-enable stdin after the end of an execution command in synchronous mode, or after an error from the target, and we aborted the exec operation. */ @@ -562,6 +578,7 @@ async_enable_stdin (void) if (ui->prompt_state == PROMPT_BLOCKED) { target_terminal_ours (); + ui_register_input_event_handler (ui); ui->prompt_state = PROMPT_NEEDED; } } @@ -575,6 +592,7 @@ async_disable_stdin (void) struct ui *ui = current_ui; ui->prompt_state = PROMPT_BLOCKED; + delete_file_handler (ui->input_fd); } @@ -1284,7 +1302,7 @@ gdb_setup_readline (int editing) Another source is going to be the target program (inferior), but that must be registered only when it actually exists (I.e. after we say 'run' or after we connect to a remote target. */ - add_file_handler (ui->input_fd, stdin_event_handler, ui); + ui_register_input_event_handler (ui); } /* Disable command input through the standard CLI channels. Used in |