Mirrors_Framework/c-periphery
1
0
Fork 0
mirror of https://github.com/vsergeev/c-periphery.git synced 2026-09-25 06:23:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

serial: fix performance of blocking read

Browse Source 
serial_read() was performing continuous non-blocking reads when called
with a negative timeout for a blocking read.
This commit is contained in:
Vanya A. Sergeev
2019-10-08 22:25:34 -05:00
parent a9a2aa8f07
commit 04329dd5f1
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serial.c
+7 -9
View File
@@ -250,17 +250,15 @@ int serial_read(serial_t *serial, uint8_t *buf, size_t len, int timeout_ms) {
bytes_read = 0;
do {
if (timeout_ms >= 0) {
FD_ZERO(&rfds);
FD_SET(serial->fd, &rfds);
FD_ZERO(&rfds);
FD_SET(serial->fd, &rfds);
if ((ret = select(serial->fd+1, &rfds, NULL, NULL, &tv_timeout)) < 0)
return _serial_error(serial, SERIAL_ERROR_IO, errno, "select() on serial port");
if ((ret = select(serial->fd+1, &rfds, NULL, NULL, (timeout_ms < 0) ? NULL : &tv_timeout)) < 0)
return _serial_error(serial, SERIAL_ERROR_IO, errno, "select() on serial port");
/* Timeout / nothing more to read */
if (ret == 0)
break;
}
/* Timeout */
if (ret == 0)
break;
if ((ret = read(serial->fd, buf + bytes_read, bytes_left)) < 0)
return _serial_error(serial, SERIAL_ERROR_IO, errno, "Reading serial port");