Skip to content

Commit 1ba1ac8

Browse files
committed
gdb: Enable stdin on exception in execute_gdb_command
This is an update of this patch: https://sourceware.org/ml/gdb-patches/2018-09/msg00884.html This patch attempts to address PR gdb/23718 by re-enabling stdin whenever an exception is caught during gdb.execute(). When Python gdb.execute() is called, an exception could occur (e.g. the target disappearing), which is then converted into a Python exception. If stdin was disabled before the exception is caught, it is not re-enabled, because the exception doesn't propagate to the top level of the event loop, whose catch block would otherwise enable it. The result is that when execution of a Python script completes, GDB does not prompt or accept input, and is effectively hung. This change rectifies the issue by re-enabling stdin in the catch block of execute_gdb_command, prior to converting the exception to a Python exception. Since this patch was originally posted I've added a test, and also I converted the code to re-enable stdin from this: SWITCH_THRU_ALL_UIS () { async_enable_stdin (); } to simply this: async_enable_stdin (); My reasoning is that we only need the SWITCH_THRU_ALL_UIS if, at the time the exception is caught, the current_ui might be different than at the time we called async_disable_stdin. Within python's execute_gdb_command I think it should be impossible to switch current_ui, so the SWITCH_THRU_ALL_UIS isn't needed. gdb/ChangeLog: PR gdb/23718 * gdb/python/python.c (execute_gdb_command): Call async_enable_stdin in catch block. gdb/testsuite/ChangeLog: PR gdb/23718 * gdb.server/server-kill-python.exp: New file. Change-Id: I1cfc36ee9f8484cc1ed82be9be338353db6bc080
1 parent f3364a6 commit 1ba1ac8

File tree

4 files changed

+105
-0
lines changed

4 files changed

+105
-0
lines changed

gdb/ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2020-01-24 Graham Markall <graham.markall@embecosm.com>
2+
3+
PR gdb/23718
4+
* gdb/python/python.c (execute_gdb_command): Call
5+
async_enable_stdin in catch block.
6+
17
2020-01-24 Andrew Burgess <andrew.burgess@embecosm.com>
28

39
* event-loop.c (start_event_loop): Wrap async_enable_stdin with

gdb/python/python.c

+6
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,12 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw)
624624
}
625625
catch (const gdb_exception &except)
626626
{
627+
/* If an exception occurred then we won't hit normal_stop (), or have
628+
an exception reach the top level of the event loop, which are the
629+
two usual places in which stdin would be re-enabled. So, before we
630+
convert the exception and continue back in Python, we should
631+
re-enable stdin here. */
632+
async_enable_stdin ();
627633
GDB_PY_HANDLE_EXCEPTION (except);
628634
}
629635

gdb/testsuite/ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2020-01-24 Andrew Burgess <andrew.burgess@embecosm.com>
2+
3+
PR gdb/23718
4+
* gdb.server/server-kill-python.exp: New file.
5+
16
2020-01-24 Andrew Burgess <andrew.burgess@embecosm.com>
27

38
* gdb.server/multi-ui-errors.c: New file.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# This testcase is part of GDB, the GNU debugger.
2+
#
3+
# Copyright 2019-2020 Free Software Foundation, Inc.
4+
#
5+
# This program is free software; you can redistribute it and/or modify
6+
# it under the terms of the GNU General Public License as published by
7+
# the Free Software Foundation; either version 3 of the License, or
8+
# (at your option) any later version.
9+
#
10+
# This program is distributed in the hope that it will be useful,
11+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# GNU General Public License for more details.
14+
#
15+
# You should have received a copy of the GNU General Public License
16+
# along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
18+
# This test script exposes a bug where, if gdbserver dies while GDB is
19+
# sourcing a python command like 'gdb.execute ("continue")', then GDB
20+
# will deadlock.
21+
22+
load_lib gdbserver-support.exp
23+
24+
standard_testfile multi-ui-errors.c
25+
26+
if {[skip_gdbserver_tests]} {
27+
return 0
28+
}
29+
30+
if {[build_executable "failed to prepare" ${testfile} \
31+
${srcfile}] == -1} {
32+
return -1
33+
}
34+
35+
# Start gdbserver.
36+
set res [gdbserver_spawn "${binfile}"]
37+
set gdbserver_protocol [lindex $res 0]
38+
set gdbserver_gdbport [lindex $res 1]
39+
set gdbserver_pid [exp_pid -i $server_spawn_id]
40+
41+
# Generate a python script we will later source.
42+
set file1 [standard_output_file file1.py]
43+
set fd [open "$file1" w]
44+
puts $fd \
45+
"import gdb
46+
47+
def do_gdb_stuff ():
48+
gdb.execute ('target $gdbserver_protocol $gdbserver_gdbport')
49+
gdb.execute ('continue')
50+
51+
do_gdb_stuff()"
52+
close $fd
53+
54+
# Now start GDB, sourcing the python command file we generated above.
55+
# Set the height and width so we don't end up at a paging prompt.
56+
if {[gdb_spawn_with_cmdline_opts \
57+
"-quiet -iex \"set height 0\" -iex \"set width 0\" -ex \"source $file1\""] != 0} {
58+
fail "spawn"
59+
return
60+
}
61+
62+
# Wait for the inferior to start up.
63+
with_spawn_id $server_spawn_id {
64+
gdb_test_multiple "" "ensure inferior is running" {
65+
-re "@@XX@@ Inferior Starting @@XX@@" {
66+
pass $gdb_test_name
67+
}
68+
timeout {
69+
fail $gdb_tst_name
70+
}
71+
}
72+
}
73+
74+
# Now kill the gdbserver.
75+
remote_exec target "kill -9 $gdbserver_pid"
76+
77+
# Wait for GDB to return to a prompt.
78+
gdb_test_multiple "" "landed at prompt after gdbserver dies" {
79+
-re "$gdb_prompt $" {
80+
pass $gdb_test_name
81+
}
82+
timeout {
83+
fail "$gdb_test_name (timeout)"
84+
}
85+
}
86+
87+
# Run a simple command to ensure we can interact with GDB.
88+
gdb_test "echo hello\\n" "hello" "can we interact with gdb"

0 commit comments

Comments
 (0)