diff options
author | Pedro Alves <palves@redhat.com> | 2014-07-14 19:55:32 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2014-07-14 20:33:16 +0100 |
commit | 93d6eb10ede1d8b72b274345c63f66439eaf7fd0 (patch) | |
tree | d6a6f986d064b31bd7f1572ae207ca8bf62f4aab /gdb/top.c | |
parent | 0017922d0292d8c374584f6100874580659c9973 (diff) | |
download | gdb-93d6eb10ede1d8b72b274345c63f66439eaf7fd0.zip gdb-93d6eb10ede1d8b72b274345c63f66439eaf7fd0.tar.gz gdb-93d6eb10ede1d8b72b274345c63f66439eaf7fd0.tar.bz2 |
Remove the target from the event loop while in secondary prompts
If a pagination prompt triggers while the target is running, and the
target exits before the user responded to the pagination query, this
happens:
Starting program: foo
---Type <return> to continue, or q <return> to quit---No unwaited-for children left.
Couldn't get registers: No such process.
Couldn't get registers: No such process.
Couldn't get registers: No such process.
(gdb) Couldn't get registers: No such process.
(gdb)
To reiterate, the user hasn't replied to the pagination prompt above.
A pagination query nests an event loop (in gdb_readline_wrapper). In
async mode, in addition to stdin and signal handlers, we'll have the
target also installed in the event loop still. So if the target
reports an event, that wakes up the nested event loop, which calls
into fetch_inferior_event etc. to handle the event which generates
further output, all while we should be waiting for pagination
confirmation...
(TBC, any target event that generates output ends up spuriously waking
up the pagination, though exits seem to be the worse kind.)
I've played with a couple different approaches to fixing this, while
at the same time trying to avoid being invasive. Both revolve around
not listening to target events while in a pagination prompt (doing
anything else I think would be a much bigger change).
The approach taken just removes the target from the event loop while
within gdb_readline_wrapper. The other approach used gdb_select
directly, with only input_fd installed, but that had the issue that it
didn't handle the async signal handlers, and turned out to be a bit
more code than the first version.
gdb/
2014-07-14 Pedro Alves <palves@redhat.com>
PR gdb/17072
* top.c: Include "inf-loop.h".
(struct gdb_readline_wrapper_cleanup) <target_is_async_orig>: New
field.
(gdb_readline_wrapper_cleanup): Make the target async again, if it
was async before.
(gdb_readline_wrapper): Store whether the target is async, and
make it sync.
gdb/testsuite/
2014-07-14 Pedro Alves <palves@redhat.com>
PR gdb/17072
* gdb.base/paginate-inferior-exit.c: New file.
* gdb.base/paginate-inferior-exit.exp: New file.
Diffstat (limited to 'gdb/top.c')
-rw-r--r-- | gdb/top.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -68,6 +68,7 @@ #include "ui-out.h" #include "cli-out.h" #include "tracepoint.h" +#include "inf-loop.h" extern void initialize_all_files (void); @@ -766,6 +767,9 @@ struct gdb_readline_wrapper_cleanup { void (*handler_orig) (char *); int already_prompted_orig; + + /* Whether the target was async. */ + int target_is_async_orig; }; static void @@ -789,6 +793,9 @@ gdb_readline_wrapper_cleanup (void *arg) after_char_processing_hook = saved_after_char_processing_hook; saved_after_char_processing_hook = NULL; + if (cleanup->target_is_async_orig) + target_async (inferior_event_handler, 0); + xfree (cleanup); } @@ -805,8 +812,13 @@ gdb_readline_wrapper (char *prompt) cleanup->already_prompted_orig = rl_already_prompted; + cleanup->target_is_async_orig = target_is_async_p (); + back_to = make_cleanup (gdb_readline_wrapper_cleanup, cleanup); + if (cleanup->target_is_async_orig) + target_async (NULL, NULL); + /* Display our prompt and prevent double prompt display. */ display_gdb_prompt (prompt); rl_already_prompted = 1; |