BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial_readline: Implement using sp_blocking_read.

This commit is contained in:
Martin Ling 2014-09-21 19:35:39 +01:00 committed by Uwe Hermann
parent 18e4d5bc45
commit bf505eed6b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/serial.c
View File

@ -530,7 +530,7 @@ SR_PRIV int serial_set_paramstr(struct sr_serial_dev_inst *serial,
SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf, SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf,
int *buflen, gint64 timeout_ms) int *buflen, gint64 timeout_ms)
{ {
gint64 start; gint64 start, remaining;
int maxlen, len; int maxlen, len;
if (!serial) { if (!serial) {
@ -543,8 +543,8 @@ SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf,
return -1; return -1;
} }
timeout_ms *= 1000;
start = g_get_monotonic_time(); start = g_get_monotonic_time();
remaining = timeout_ms;
maxlen = *buflen; maxlen = *buflen;
*buflen = len = 0; *buflen = len = 0;
@ -552,7 +552,7 @@ SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf,
len = maxlen - *buflen - 1; len = maxlen - *buflen - 1;
if (len < 1) if (len < 1)
break; break;
len = serial_read(serial, *buf + *buflen, 1); len = sp_blocking_read(serial->data, *buf + *buflen, 1, remaining);
if (len > 0) { if (len > 0) {
*buflen += len; *buflen += len;
*(*buf + *buflen) = '\0'; *(*buf + *buflen) = '\0';
@ -563,7 +563,9 @@ SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf,
break; break;
} }
} }
if (g_get_monotonic_time() - start > timeout_ms) /* Reduce timeout by time elapsed. */
remaining = timeout_ms - ((g_get_monotonic_time() - start) / 1000);
if (remaining <= 0)
/* Timeout */ /* Timeout */
break; break;
if (len < 1) if (len < 1)