diff options
| author | Simon Marchi <simon.marchi@ericsson.com> | 2014-12-10 13:03:47 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2014-12-10 13:03:47 -0500 |
| commit | 1abf3a143773819e195fceaa485060dcac9e6089 (patch) | |
| tree | f1d0a6fee8726be5a383e7d554c1da0a182d4c66 /gdb/mi/mi-interp.c | |
| parent | f4943d8253e8c9c539fd72d23e94a65f84c92d1a (diff) | |
| download | gdb-1abf3a143773819e195fceaa485060dcac9e6089.zip gdb-1abf3a143773819e195fceaa485060dcac9e6089.tar.gz gdb-1abf3a143773819e195fceaa485060dcac9e6089.tar.bz2 | |
Restore terminal state in mi_thread_exit (PR gdb/17627)
When a thread exits, the terminal is left in mode "terminal_is_ours"
while the target executes. This patch fixes that.
We need to manually restore the terminal setting in this particular
observer. In the case of the other MI observers that call
target_terminal_ours, gdb will end up resuming the inferior later in the
execution and call target_terminal_inferior. In the case of the thread
exit event, we still need to call target_terminal_ours to be able to
print something, but there is nothing that gdb will need to resume after
that. We therefore need to call target_terminal_inferior ourselves.
gdb/ChangeLog:
PR gdb/17627
* target.c (cleanup_restore_target_terminal): New function.
(make_cleanup_restore_target_terminal): New function.
* target.h (make_cleanup_restore_target_terminal): New
declaration.
* mi/mi-interp.c (mi_thread_exit): Use the new cleanup.
Signed-off-by: Simon Marchi <simon.marchi@ericsson.com>
Diffstat (limited to 'gdb/mi/mi-interp.c')
| -rw-r--r-- | gdb/mi/mi-interp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index df2b558..60f0666 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -386,6 +386,7 @@ mi_thread_exit (struct thread_info *t, int silent) { struct mi_interp *mi; struct inferior *inf; + struct cleanup *old_chain; if (silent) return; @@ -393,11 +394,14 @@ mi_thread_exit (struct thread_info *t, int silent) inf = find_inferior_pid (ptid_get_pid (t->ptid)); mi = top_level_interpreter_data (); + old_chain = make_cleanup_restore_target_terminal (); target_terminal_ours (); fprintf_unfiltered (mi->event_channel, "thread-exited,id=\"%d\",group-id=\"i%d\"", t->num, inf->num); gdb_flush (mi->event_channel); + + do_cleanups (old_chain); } /* Emit notification on changing the state of record. */ |