This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] PR remote/21188: Fix remote serial timeout
- From: Gareth McMullin <gareth at blacksphere dot co dot nz>
- To: gdb-patches at sourceware dot org
- Date: Tue, 21 Feb 2017 11:52:11 +1300
- Subject: [PATCH] PR remote/21188: Fix remote serial timeout
- Authentication-results: sourceware.org; auth=none
The timeout mechanism in ser-unix.c was changed in commit 048094acc.
In do_hardwire_readchar(), the required timeout is broken into 1
second intervals and wait_for() is called. Before, wait_for() set
VTIME and VMIN so the read would block, but now it uses select() to
block for the specified timeout. If wait_for() returns
SERIAL_TIMEOUT, do_hardwire_readchar() returns immediately, so the
timeout is always only 1s.
The attached patch will repeatedly call wait_for() until the full
timeout has elapsed.
Gareth
2017-02-21 Gareth McMullin <gareth@blacksphere.co.nz>
PR remote/21188
* ser-unix.c (do_hardwire_readchar): Wait for full timeout to elapse.
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index b9e55f0..0a74672 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -549,6 +549,18 @@ do_hardwire_readchar (struct serial *scb, int timeout)
scb->timeout_remaining = (timeout < 0 ? timeout : timeout - delta);
status = wait_for (scb, delta);
+ if (status == SERIAL_TIMEOUT) {
+ if (scb->timeout_remaining > 0)
+ {
+ timeout = scb->timeout_remaining;
+ continue;
+ }
+ else if (scb->timeout_remaining < 0)
+ continue;
+ else
+ return SERIAL_TIMEOUT;
+ }
+
if (status < 0)
return status;
@@ -556,21 +568,7 @@ do_hardwire_readchar (struct serial *scb, int timeout)
if (status <= 0)
{
- if (status == 0)
- {
- /* Zero characters means timeout (it could also be EOF, but
- we don't (yet at least) distinguish). */
- if (scb->timeout_remaining > 0)
- {
- timeout = scb->timeout_remaining;
- continue;
- }
- else if (scb->timeout_remaining < 0)
- continue;
- else
- return SERIAL_TIMEOUT;
- }
- else if (errno == EINTR)
+ if (errno == EINTR)
continue;
else
return SERIAL_ERROR; /* Got an error from read. */