From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5650 invoked by alias); 6 May 2016 12:45:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 5272 invoked by uid 89); 6 May 2016 12:45:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=sk:double-, Simply, died X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 06 May 2016 12:45:01 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A85D80096 for ; Fri, 6 May 2016 12:35:30 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u46CZ5IO017259 for ; Fri, 6 May 2016 08:35:30 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH v3 27/34] Handle UI's terminal closing Date: Fri, 06 May 2016 12:45:00 -0000 Message-Id: <1462538104-19109-28-git-send-email-palves@redhat.com> In-Reply-To: <1462538104-19109-1-git-send-email-palves@redhat.com> References: <1462538104-19109-1-git-send-email-palves@redhat.com> X-SW-Source: 2016-05/txt/msg00126.txt.bz2 Without this, GDB exits if a secondary UIs terminal/input stream is closed: $ ./gdb -ex "new-ui mi /dev/pts/6" New UI allocated <<< close /dev/pts/6 (gdb) Error detected on fd 9 $ We want that for the main UI, but not secondary UIs. gdb/ChangeLog: yyyy-mm-dd Pedro Alves * event-top.c (stdin_event_handler): Don't quit gdb if it was a secondary UI's input stream that closed. Instead, just delete the UI. --- gdb/event-top.c | 42 +++++++++++++++++++++++++++--------------- gdb/top.c | 31 +++++++++++++++++++++++++++++++ gdb/top.h | 1 + 3 files changed, 59 insertions(+), 15 deletions(-) diff --git a/gdb/event-top.c b/gdb/event-top.c index 318da1d..777823e 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -508,33 +508,45 @@ stdin_event_handler (int error, gdb_client_data client_data) { struct ui *ui = (struct ui *) client_data; - /* Switch to the UI whose input descriptor woke up the event - loop. */ - current_ui = ui; - if (error) { - printf_unfiltered (_("error detected on stdin\n")); + /* Switch to the main UI, so diagnostics always go there. */ + current_ui = main_ui; + delete_file_handler (ui->input_fd); - /* If stdin died, we may as well kill gdb. */ - quit_command ((char *) 0, stdin == ui->instream); + if (main_ui == ui) + { + /* If stdin died, we may as well kill gdb. */ + printf_unfiltered (_("error detected on stdin\n")); + quit_command ((char *) 0, stdin == ui->instream); + } + else + { + /* Simply delete the UI. */ + delete_ui (ui); + } } else { - /* This makes sure a ^C immediately followed by further input is - always processed in that order. E.g,. with input like - "^Cprint 1\n", the SIGINT handler runs, marks the async signal - handler, and then select/poll may return with stdin ready, - instead of -1/EINTR. The - gdb.base/double-prompt-target-event-error.exp test exercises - this. */ + /* Switch to the UI whose input descriptor woke up the event + loop. */ + current_ui = ui; + + /* This makes sure a ^C immediately followed by further input is + always processed in that order. E.g,. with input like + "^Cprint 1\n", the SIGINT handler runs, marks the async + signal handler, and then select/poll may return with stdin + ready, instead of -1/EINTR. The + gdb.base/double-prompt-target-event-error.exp test exercises + this. */ QUIT; do { call_stdin_event_handler_again_p = 0; ui->call_readline (client_data); - } while (call_stdin_event_handler_again_p != 0); + } + while (call_stdin_event_handler_again_p != 0); } } diff --git a/gdb/top.c b/gdb/top.c index c5e237d..5883875 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -286,6 +286,37 @@ new_ui (FILE *instream, FILE *outstream, FILE *errstream) return ui; } +static void +free_ui (struct ui *ui) +{ + ui_file_delete (ui->m_gdb_stdin); + ui_file_delete (ui->m_gdb_stdout); + ui_file_delete (ui->m_gdb_stderr); + + xfree (ui); +} + +void +delete_ui (struct ui *todel) +{ + struct ui *ui, *uiprev; + + uiprev = NULL; + + for (ui = ui_list; ui != NULL; uiprev = ui, ui = ui->next) + if (ui == todel) + break; + + gdb_assert (ui != NULL); + + if (uiprev != NULL) + uiprev->next = ui->next; + else + ui_list = ui->next; + + free_ui (ui); +} + /* Handler for SIGHUP. */ #ifdef SIGHUP diff --git a/gdb/top.h b/gdb/top.h index c933d6b..a0fa391 100644 --- a/gdb/top.h +++ b/gdb/top.h @@ -175,6 +175,7 @@ extern void switch_thru_all_uis_next (struct switch_thru_all_uis *state); /* Create a new UI. */ extern struct ui *new_ui (FILE *instream, FILE *outstream, FILE *errstream); +extern void delete_ui (struct ui *todel); /* Cleanup that restores the current UI. */ extern void restore_ui_cleanup (void *data); -- 2.5.5