Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-23 04:04:54 +08:00
Code Issues Projects Releases Wiki Activity

Fix issue with write() and a timeout of 0.

Browse Source
This commit is contained in:
Rob Doolittle 2016-09-21 22:37:22 -07:00
parent 2d416f1560
commit 64395f314f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/serial/serial.h
View File

@ -450,6 +450,8 @@ public:
* reading or writing is complete, when a timeout occurs, or when an * reading or writing is complete, when a timeout occurs, or when an
* exception occurs. * exception occurs.
* *
* A timeout of 0 enables non-blocking mode.
*
* \param timeout A serial::Timeout struct containing the inter byte * \param timeout A serial::Timeout struct containing the inter byte
* timeout, and the read and write timeout constants and multipliers. * timeout, and the read and write timeout constants and multipliers.
* *

8
src/impl/unix.cc
View File

@ -617,12 +617,18 @@ Serial::SerialImpl::write (const uint8_t *data, size_t length)
total_timeout_ms += timeout_.write_timeout_multiplier * static_cast<long> (length); total_timeout_ms += timeout_.write_timeout_multiplier * static_cast<long> (length);
MillisecondTimer total_timeout(total_timeout_ms); MillisecondTimer total_timeout(total_timeout_ms);
bool first = true;
while (bytes_written < length) { while (bytes_written < length) {
int64_t timeout_remaining_ms = total_timeout.remaining(); int64_t timeout_remaining_ms = total_timeout.remaining();
if (timeout_remaining_ms <= 0) { // Only consider the timeout if it's not the first iteration of the loop
// otherwise a timeout of 0 won't be allowed through
if (!first && (timeout_remaining_ms <= 0)) {
// Timed out // Timed out
break; break;
} }
if( first ) {
first = false;
}
timespec timeout(timespec_from_ms(timeout_remaining_ms)); timespec timeout(timespec_from_ms(timeout_remaining_ms));
FD_ZERO (&writefds); FD_ZERO (&writefds);