diff options
| author | Yao Qi <yao.qi@linaro.org> | 2016-06-01 09:33:40 +0100 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2016-06-01 09:33:40 +0100 |
| commit | 03d73f1fd9d89d89bdd021cad26693e4f6abc07a (patch) | |
| tree | 586d60fac0489c54641a793dc025c5bf8f8ccb19 /gdb | |
| parent | a2b5fccc630a7cb7e1c241e5249bf6e8917d917d (diff) | |
| download | gdb-03d73f1fd9d89d89bdd021cad26693e4f6abc07a.zip gdb-03d73f1fd9d89d89bdd021cad26693e4f6abc07a.tar.gz gdb-03d73f1fd9d89d89bdd021cad26693e4f6abc07a.tar.bz2 | |
Wake up interruptible_select in remote_fileio ctrl-c handler
As reported in PR 19998, after type ctrl-c, GDB hang there and does
not send interrupt. It causes a fail in gdb.base/interrupt.exp.
All targets support remote fileio should be affected.
When we type ctrc-c, SIGINT is handled by remote_fileio_sig_set,
as shown below,
#0 remote_fileio_sig_set (sigint_func=0x4495d0 <remote_fileio_ctrl_c_signal_handler(int)>) at /home/yao/SourceCode/gnu/gdb/git/gdb/remote-fileio.c:325
#1 0x00000000004495de in remote_fileio_ctrl_c_signal_handler (signo=<optimised out>) at /home/yao/SourceCode/gnu/gdb/git/gdb/remote-fileio.c:349
#2 <signal handler called>
#3 0x00007ffff647ed83 in __select_nocancel () at ../sysdeps/unix/syscall-template.S:81
#4 0x00000000005530ce in interruptible_select (n=10, readfds=readfds@entry=0x7fffffffd730, writefds=writefds@entry=0x0, exceptfds=exceptfds@entry=0x0,
timeout=timeout@entry=0x0) at /home/yao/SourceCode/gnu/gdb/git/gdb/event-top.c:1017
#5 0x000000000061ab20 in stdio_file_read (file=<optimised out>, buf=0x12d02e0 "\n\022-\001", length_buf=16383)
at /home/yao/SourceCode/gnu/gdb/git/gdb/ui-file.c:577
#6 0x000000000044a4dc in remote_fileio_func_read (buf=0x12c0360 "") at /home/yao/SourceCode/gnu/gdb/git/gdb/remote-fileio.c:583
#7 0x0000000000449598 in do_remote_fileio_request (uiout=<optimised out>, buf_arg=buf_arg@entry=0x12c0340)
at /home/yao/SourceCode/gnu/gdb/git/gdb/remote-fileio.c:1179
we don't set quit_serial_event,
do
{
res = gdb_select (n, readfds, writefds, exceptfds, timeout);
}
while (res == -1 && errno == EINTR);
if (res == 1 && FD_ISSET (fd, readfds))
{
errno = EINTR;
return -1;
}
return res;
we can't go out of the loop above, and that is why GDB can't send
interrupt.
Recently, we stop throwing exception from SIGINT handler
(remote_fileio_ctrl_c_signal_handler)
https://sourceware.org/ml/gdb-patches/2016-03/msg00372.html, which
is correct, because gdb_select is interruptible. However, in the
same patch series, we add interruptible_select later as a wrapper
to gdb_select, https://sourceware.org/ml/gdb-patches/2016-03/msg00375.html
and it is not interruptible (because of the loop in it) unless
select/poll-able file descriptors are marked.
This fix in this patch is to call quit_serial_event_set, so that we can
go out of the loop above, return -1 and set errno to EINTR.
2016-06-01 Yao Qi <yao.qi@linaro.org>
PR remote/19998
* remote-fileio.c (remote_fileio_ctrl_c_signal_handler): Call
quit_serial_event_set.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/remote-fileio.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 10c9c05..f9dc6f9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-06-01 Yao Qi <yao.qi@linaro.org> + + PR remote/19998 + * remote-fileio.c (remote_fileio_ctrl_c_signal_handler): Call + quit_serial_event_set. + 2016-06-01 Joel Brobecker <brobecker@adacore.com> GDB 7.11.1 released. diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c index 44817df..29c5ca3 100644 --- a/gdb/remote-fileio.c +++ b/gdb/remote-fileio.c @@ -348,6 +348,8 @@ remote_fileio_ctrl_c_signal_handler (int signo) { remote_fileio_sig_set (remote_fileio_ctrl_c_signal_handler); remote_fio_ctrl_c_flag = 1; + /* Wake up interruptible_select. */ + quit_serial_event_set (); } static void |