From patchwork Tue Dec 2 22:10:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 4039 Received: (qmail 23251 invoked by alias); 2 Dec 2014 22:10:33 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 23235 invoked by uid 89); 2 Dec 2014 22:10:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg21.ericsson.net Received: from usevmg21.ericsson.net (HELO usevmg21.ericsson.net) (198.24.6.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 02 Dec 2014 22:10:31 +0000 Received: from EUSAAHC002.ericsson.se (Unknown_Domain [147.117.188.78]) by usevmg21.ericsson.net (Symantec Mail Security) with SMTP id 7F.D6.25146.8ACDD745; Tue, 2 Dec 2014 16:37:13 +0100 (CET) Received: from simark-hp.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.78) with Microsoft SMTP Server (TLS) id 14.3.195.1; Tue, 2 Dec 2014 17:10:28 -0500 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH v2] Restore terminal state in mi_thread_exit (PR gdb/17627) Date: Tue, 2 Dec 2014 17:10:23 -0500 Message-ID: <1417558223-27328-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes When a thread exits, the terminal is left in mode "terminal_is_ours" while the target executes. This patch fixes that. From my understanding, a function calling target_terminal_ours expects that the terminal could be in any state at the moment it is called. Therefore, it should be its reponsibility to put back the terminal in whatever state it was before being called. I find that this fits quite well the cleanup model, so I implemented a cleanup for that. New in v2: * Coding style fixes. * Use make_cleanup_dtor instead of make_cleanup. 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 --- gdb/mi/mi-interp.c | 4 ++++ gdb/target.c | 34 ++++++++++++++++++++++++++++++++++ gdb/target.h | 4 ++++ 3 files changed, 42 insertions(+) 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. */ diff --git a/gdb/target.c b/gdb/target.c index ab5f2b9..7161e62 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -528,6 +528,40 @@ target_supports_terminal_ours (void) return 0; } +/* Restore the terminal to its previous state (helper for + make_cleanup_restore_target_terminal). */ + +static void +cleanup_restore_target_terminal (void *arg) +{ + enum terminal_state *previous_state = arg; + + switch (*previous_state) + { + case terminal_is_ours: + target_terminal_ours (); + break; + case terminal_is_ours_for_output: + target_terminal_ours_for_output (); + break; + case terminal_is_inferior: + target_terminal_inferior (); + break; + } +} + +/* See target.h. */ + +struct cleanup * +make_cleanup_restore_target_terminal (void) +{ + enum terminal_state *ts = xmalloc (sizeof (*ts)); + + *ts = terminal_state; + + return make_cleanup_dtor (cleanup_restore_target_terminal, ts, xfree); +} + static void tcomplain (void) { diff --git a/gdb/target.h b/gdb/target.h index d363b61..eb3220e 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1413,6 +1413,10 @@ extern void target_terminal_ours (void); extern int target_supports_terminal_ours (void); +/* Make a cleanup that restores the state of the terminal to the current + value. */ +extern struct cleanup *make_cleanup_restore_target_terminal (void); + /* Print useful information about our terminal status, if such a thing exists. */