diff options
author | Pedro Alves <palves@redhat.com> | 2016-04-12 16:49:32 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2016-04-12 17:00:01 +0100 |
commit | 651ce16aa7c2bd5e9f634e91e73790dc3e01a5c0 (patch) | |
tree | 1f2f3ba10a62fb0054b191fa16ee315239a8f9cb /gdb/gnu-nat.c | |
parent | 80dbc9fdc7a7929c16f58852e45196a32877b013 (diff) | |
download | gdb-651ce16aa7c2bd5e9f634e91e73790dc3e01a5c0.zip gdb-651ce16aa7c2bd5e9f634e91e73790dc3e01a5c0.tar.gz gdb-651ce16aa7c2bd5e9f634e91e73790dc3e01a5c0.tar.bz2 |
Do target_terminal_ours in query & friends instead of in all callers
Any time a caller calls query & friends / prompt_for_continue without
ensuring that gdb owns the terminal for input is a bug. So do that in
defaulted_query / prompt_for_continue directly instead.
An example of a case where we currently miss calling
target_terminal_ours is internal_error. Ever since defaulted_query
was made to use gdb_readline_callback, there's no way to answer the
internal error query if the internal error happens while the target is
has the terminal:
(gdb) c
Continuing.
.../src/gdb/linux-nat.c:1676: internal-error: linux_nat_resume: Assertion `dummy_counter < 10' failed.
A problem internal to GDB has been detected,
further debugging may prove unreliable.
Quit this debugging session? (y or n) _
Entering 'y' or 'n' does not work, GDB does not respond.
gdb/ChangeLog:
2016-04-12 Pedro Alves <palves@redhat.com>
PR gdb/19828
* gnu-nat.c (inf_validate_task_sc): Don't call
target_terminal_ours / target_terminal_inferior around query.
* i386-tdep.c (i386_record_lea_modrm, i386_process_record): Don't
call target_terminal_ours / target_terminal_inferior around
yquery.
* linux-record.c (record_linux_system_call): Don't call
target_terminal_ours / target_terminal_inferior around yquery.
* nto-procfs.c (interrupt_query): Don't call target_terminal_ours
/ target_terminal_inferior around query.
* record-full.c (record_full_check_insn_num): Remove
'set_terminal' parameter. Don't call target_terminal_ours /
target_terminal_inferior around query.
(record_full_message, record_full_registers_change)
(record_full_xfer_partial): Adjust.
* remote.c (interrupt_query): Don't call target_terminal_ours /
target_terminal_inferior around query.
* utils.c (defaulted_query): Install cleanup to restore target
terminal. Put target_terminal_ours_for_output in effect while
defaulted producing, and target_terminal_ours in in effect while
handling input.
(prompt_for_continue): Install cleanup to restore target terminal.
Put target_terminal_ours in in effect while handling input.
Diffstat (limited to 'gdb/gnu-nat.c')
-rw-r--r-- | gdb/gnu-nat.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index b0b870c..c268732 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -852,15 +852,9 @@ inf_validate_task_sc (struct inf *inf) if (inf->task->cur_sc < suspend_count) { - int abort; - - target_terminal_ours (); /* Allow I/O. */ - abort = !query (_("Pid %d has an additional task suspend count of %d;" - " clear it? "), inf->pid, - suspend_count - inf->task->cur_sc); - target_terminal_inferior (); /* Give it back to the child. */ - - if (abort) + if (!query (_("Pid %d has an additional task suspend count of %d;" + " clear it? "), inf->pid, + suspend_count - inf->task->cur_sc)) error (_("Additional task suspend count left untouched.")); inf->task->cur_sc = suspend_count; |