From patchwork Sat Nov 23 01:04:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36155 Received: (qmail 47053 invoked by alias); 23 Nov 2019 01:05:04 -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 47000 invoked by uid 89); 23 Nov 2019 01:05:04 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT autolearn=ham version=3.3.1 spammy=escaped, Inferior X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 23 Nov 2019 01:05:01 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id EFFC620470; Fri, 22 Nov 2019 20:04:59 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id 6F9EA2030C for ; Fri, 22 Nov 2019 20:04:58 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 284D92816F for ; Fri, 22 Nov 2019 20:04:58 -0500 (EST) X-Gerrit-PatchSet: 1 Date: Fri, 22 Nov 2019 20:04:58 -0500 From: "Andrew Burgess (Code Review)" To: gdb-patches@sourceware.org Message-ID: Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange Subject: [review] gdb: Re-enable stdin for all UIs from start_event_loop X-Gerrit-Change-Id: I1e18deff2e6f4e17f7a13adce3553eb001cad93b X-Gerrit-Change-Number: 700 X-Gerrit-ChangeURL: X-Gerrit-Commit: 07f571689453aaf8a5d33f06b52f36479d42276a References: Reply-To: andrew.burgess@embecosm.com, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/700 ...................................................................... gdb: Re-enable stdin for all UIs from start_event_loop If we catch an exception in start_event_loop's call to gdb_do_one_event, then it is possible that the current_ui has changed since we called async_disable_stdin. If that's the case then calling async_enable_stdin will be called on the wrong UI. To solve this problem we wrap the call to async_enable_stdin with SWITCH_THRU_ALL_UIS, this causes us to try and re-enable stdin for all UIs, which will catch any for which we called async_disable_stdin. gdb/ChangeLog: * event-loop.c (start_event_loop): Wrap async_enable_stdin with SWITCH_THRU_ALL_UIS. gdb/testsuite/ChangeLog: * gdb.server/multi-ui-errors.c: New file. * gdb.server/multi-ui-errors.exp: New file. Change-Id: I1e18deff2e6f4e17f7a13adce3553eb001cad93b --- M gdb/ChangeLog M gdb/event-loop.c M gdb/testsuite/ChangeLog A gdb/testsuite/gdb.server/multi-ui-errors.c A gdb/testsuite/gdb.server/multi-ui-errors.exp 5 files changed, 152 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 65da2ff..aa7e5db 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-11-22 Andrew Burgess + + * event-loop.c (start_event_loop): Wrap async_enable_stdin with + SWITCH_THRU_ALL_UIS. + 2019-11-22 Tom Tromey * observable.h: Update comments. diff --git a/gdb/event-loop.c b/gdb/event-loop.c index affa00b..b944415 100644 --- a/gdb/event-loop.c +++ b/gdb/event-loop.c @@ -376,7 +376,10 @@ /* If any exception escaped to here, we better enable stdin. Otherwise, any command that calls async_disable_stdin, and then throws, will leave stdin inoperable. */ - async_enable_stdin (); + SWITCH_THRU_ALL_UIS () + { + async_enable_stdin (); + } /* If we long-jumped out of do_one_event, we probably didn't get around to resetting the prompt, which leaves readline in a messed-up state. Reset it here. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d4c42bd..3d2c4c4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-11-22 Andrew Burgess + + * gdb.server/multi-ui-errors.c: New file. + * gdb.server/multi-ui-errors.exp: New file. + 2019-11-21 Peeter Joot * gdb.base/endianity.c: New test. diff --git a/gdb/testsuite/gdb.server/multi-ui-errors.c b/gdb/testsuite/gdb.server/multi-ui-errors.c new file mode 100644 index 0000000..0e6c0ea --- /dev/null +++ b/gdb/testsuite/gdb.server/multi-ui-errors.c @@ -0,0 +1,30 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2019 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include +#include + +int +main (void) +{ + printf ("@@XX@@ Inferior Starting @@XX@@\n"); + + while (1) + sleep (1); + + return 0; +} diff --git a/gdb/testsuite/gdb.server/multi-ui-errors.exp b/gdb/testsuite/gdb.server/multi-ui-errors.exp new file mode 100644 index 0000000..142e786 --- /dev/null +++ b/gdb/testsuite/gdb.server/multi-ui-errors.exp @@ -0,0 +1,108 @@ +# This testcase is part of GDB, the GNU debugger. +# +# Copyright 2019 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test what happens if we have multiple UIs in use, and an error +# occurs while running a GDB command. Specifically, do both UIs +# return to an interactive state, or does one (or both) of them get +# stuck in a non-interactive state. + +load_lib gdbserver-support.exp + +standard_testfile + +if {[skip_gdbserver_tests]} { + return 0 +} + +if {[build_executable "failed to prepare" ${testfile} \ + ${srcfile}] == -1} { + return -1 +} + +clean_restart $testfile + +# Start gdbserver. +set res [gdbserver_spawn "${binfile}"] +set gdbserver_protocol [lindex $res 0] +set gdbserver_gdbport [lindex $res 1] +set gdbserver_pid [exp_pid -i $server_spawn_id] + +# Save the main UI's spawn ID. +set gdb_main_spawn_id $gdb_spawn_id + +# Create the new PTY for the secondary console UI, issue the 'new-ui' +# command, and wait for a prompt on the second UI. +spawn -pty +set extra_spawn_id $spawn_id +set extra_tty_name $spawn_out(slave,name) +gdb_test_multiple "new-ui console $extra_tty_name" "new-ui" { + -re "New UI allocated\r\n$gdb_prompt $" { + pass $gdb_test_name + } +} +with_spawn_id $extra_spawn_id { + gdb_test_multiple "" "initial prompt on extra console" { + -re "$gdb_prompt $" { + pass $gdb_test_name + } + } +} + +# Connect to the remote and continue its execution from the other UI. +with_spawn_id $extra_spawn_id { + gdb_test "target $gdbserver_protocol $gdbserver_gdbport" ".*" + send_gdb "continue\n" +} + +# We're going to kill the gdbserver, but before we do, lets make sure +# that the inferior has started executing. +with_spawn_id $server_spawn_id { + gdb_expect 3 { + -re "@@XX@@ Inferior Starting @@XX@@" { + verbose -log "APB: Spotted running pattern" + } + timeout { + verbose -log "APB: Didn't find running message" + } + } +} + +# Interact with the main UI. +with_spawn_id $gdb_main_spawn_id { + gdb_test "echo hello\\n" "hello" "interact with GDB's main UI" +} + +# Now kill the gdbserver. +remote_exec target "kill -9 $gdbserver_pid" + +# We expect to land back at a GDB prompt in both UIs. Right now there +# seems to be some "issues" with the prompt automatically being +# displayed... Or maybe this is intentional and I'm missunderstanding +# the expected behaviour. Either way, getting a prompt isn't the +# point of this test. The point is that we should not be able to +# interact with GDB from either interpreter now. + +with_spawn_id $gdb_main_spawn_id { + gdb_test "echo" "" \ + "main UI, prompt after gdbserver dies" +} + +with_spawn_id $extra_spawn_id { + gdb_test "echo" "" \ + "extra UI, prompt after gdbserver dies" +} +