X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=serialport.c;h=d356057525c3e56a6afe5aefaccd28374552468f;hb=75f468923b9805207ce62f007f85c13444df314b;hp=1a9b4415438422afebc989a6b20cc6f6767a32a7;hpb=32dbe2d2984c330642e2f7cad30fc7501a923e4c;p=libserialport.git
diff --git a/serialport.c b/serialport.c
index 1a9b441..d356057 100644
--- a/serialport.c
+++ b/serialport.c
@@ -21,8 +21,6 @@
* along with this program. If not, see .
*/
-#include
-#include "libserialport.h"
#include "libserialport_internal.h"
static const struct std_baudrate std_baudrates[] = {
@@ -55,128 +53,6 @@ static enum sp_return get_config(struct sp_port *port, struct port_data *data,
static enum sp_return set_config(struct sp_port *port, struct port_data *data,
const struct sp_port_config *config);
-#ifndef _WIN32
-
-/* Timing abstraction */
-
-struct time {
- struct timeval tv;
-};
-
-struct timeout {
- unsigned int ms;
- struct time start, delta, now, end;
- struct timeval delta_tv;
- bool overflow;
-};
-
-#define TIME_ZERO {.tv = {0, 0}}
-#define TIME_MS(ms) {.tv = {ms / 1000, (ms % 1000) * 1000}}
-
-const struct time max_delta = TIME_MS(INT_MAX);
-
-static void time_get(struct time *time)
-{
-#ifdef HAVE_CLOCK_GETTIME
- struct timespec ts;
- if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1)
- clock_gettime(CLOCK_REALTIME, &ts);
- time->tv.tv_sec = ts.tv_sec;
- time->tv.tv_usec = ts.tv_nsec / 1000;
-#elif defined(__APPLE__)
- mach_timebase_info_data_t info;
- mach_timebase_info(&info);
- uint64_t ticks = mach_absolute_time();
- uint64_t ns = (ticks * info.numer) / info.denom;
- time->tv.tv_sec = ns / 1000000000;
- time->tv.tv_usec = (ns % 1000000000) / 1000;
-#else
- gettimeofday(&time->tv, NULL);
-#endif
-}
-
-static void time_set_ms(struct time *time, unsigned int ms)
-{
- time->tv.tv_sec = ms / 1000;
- time->tv.tv_usec = (ms % 1000) * 1000;
-}
-
-static void time_add(const struct time *a,
- const struct time *b, struct time *result)
-{
- timeradd(&a->tv, &b->tv, &result->tv);
-}
-
-static void time_sub(const struct time *a,
- const struct time *b, struct time *result)
-{
- timersub(&a->tv, &b->tv, &result->tv);
-}
-
-static bool time_greater(const struct time *a, const struct time *b)
-{
- return timercmp(&a->tv, &b->tv, >);
-}
-
-static void time_as_timeval(const struct time *time, struct timeval *tv)
-{
- *tv = time->tv;
-}
-
-static unsigned int time_as_ms(const struct time *time)
-{
- return time->tv.tv_sec * 1000 + time->tv.tv_usec / 1000;
-}
-
-static void timeout_start(struct timeout *timeout, unsigned int timeout_ms)
-{
- timeout->ms = timeout_ms;
-
- timeout->overflow = (timeout->ms > INT_MAX);
-
- /* Get time at start of operation. */
- time_get(&timeout->start);
- /* Define duration of timeout. */
- time_set_ms(&timeout->delta, timeout_ms);
- /* Calculate time at which we should give up. */
- time_add(&timeout->start, &timeout->delta, &timeout->end);
-}
-
-static bool timeout_check(struct timeout *timeout)
-{
- if (timeout->ms == 0)
- return false;
-
- time_get(&timeout->now);
- time_sub(&timeout->end, &timeout->now, &timeout->delta);
- if ((timeout->overflow = time_greater(&timeout->delta, &max_delta)))
- timeout->delta = max_delta;
-
- return time_greater(&timeout->now, &timeout->end);
-}
-
-static struct timeval *timeout_timeval(struct timeout *timeout)
-{
- if (timeout->ms == 0)
- return NULL;
-
- time_as_timeval(&timeout->delta, &timeout->delta_tv);
-
- return &timeout->delta_tv;
-}
-
-static unsigned int timeout_remaining_ms(struct timeout *timeout)
-{
- if (timeout->ms == 0)
- return -1;
- else if (timeout->overflow)
- return INT_MAX;
- else
- return time_as_ms(&timeout->delta);
-}
-
-#endif
-
SP_API enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
{
struct sp_port *port;
@@ -906,45 +782,66 @@ SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf,
RETURN_INT(0);
#ifdef _WIN32
- DWORD bytes_written = 0;
+ DWORD remaining_ms, write_size, bytes_written, total_bytes_written = 0;
+ const uint8_t *write_ptr = (uint8_t *) buf;
+ bool result;
+ struct timeout timeout;
+
+ timeout_start(&timeout, timeout_ms);
TRY(await_write_completion(port));
- /* Set timeout. */
- if (port->timeouts.WriteTotalTimeoutConstant != timeout_ms) {
- port->timeouts.WriteTotalTimeoutConstant = timeout_ms;
- if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
- RETURN_FAIL("SetCommTimeouts() failed");
- }
+ while (total_bytes_written < count) {
- /* Reduce count if it exceeds the WriteFile limit. */
- if (count > WRITEFILE_MAX_SIZE)
- count = WRITEFILE_MAX_SIZE;
+ if (timeout_check(&timeout))
+ break;
- /* Start write. */
- if (WriteFile(port->hdl, buf, count, NULL, &port->write_ovl)) {
- DEBUG("Write completed immediately");
- RETURN_INT(count);
- } else if (GetLastError() == ERROR_IO_PENDING) {
- DEBUG("Waiting for write to complete");
- if (GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE) == 0) {
- if (GetLastError() == ERROR_SEM_TIMEOUT) {
- DEBUG("Write timed out");
- RETURN_INT(0);
- } else {
- RETURN_FAIL("GetOverlappedResult() failed");
+ remaining_ms = timeout_remaining_ms(&timeout);
+
+ if (port->timeouts.WriteTotalTimeoutConstant != remaining_ms) {
+ port->timeouts.WriteTotalTimeoutConstant = remaining_ms;
+ if (SetCommTimeouts(port->hdl, &port->timeouts) == 0)
+ RETURN_FAIL("SetCommTimeouts() failed");
+ }
+
+ /* Reduce write size if it exceeds the WriteFile limit. */
+ write_size = count - total_bytes_written;
+ if (write_size > WRITEFILE_MAX_SIZE)
+ write_size = WRITEFILE_MAX_SIZE;
+
+ /* Start write. */
+
+ result = WriteFile(port->hdl, write_ptr, write_size, NULL, &port->write_ovl);
+
+ timeout_update(&timeout);
+
+ if (result) {
+ DEBUG("Write completed immediately");
+ bytes_written = write_size;
+ } else if (GetLastError() == ERROR_IO_PENDING) {
+ DEBUG("Waiting for write to complete");
+ if (GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE) == 0) {
+ if (GetLastError() == ERROR_SEM_TIMEOUT) {
+ DEBUG("Write timed out");
+ break;
+ } else {
+ RETURN_FAIL("GetOverlappedResult() failed");
+ }
}
+ DEBUG_FMT("Write completed, %d/%d bytes written", bytes_written, write_size);
+ } else {
+ RETURN_FAIL("WriteFile() failed");
}
- DEBUG_FMT("Write completed, %d/%d bytes written", bytes_written, count);
- RETURN_INT(bytes_written);
- } else {
- RETURN_FAIL("WriteFile() failed");
+
+ write_ptr += bytes_written;
+ total_bytes_written += bytes_written;
}
+
+ RETURN_INT(total_bytes_written);
#else
size_t bytes_written = 0;
unsigned char *ptr = (unsigned char *) buf;
struct timeout timeout;
- int started = 0;
fd_set fds;
int result;
@@ -955,16 +852,14 @@ SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf,
/* Loop until we have written the requested number of bytes. */
while (bytes_written < count) {
- /*
- * Check timeout only if we have run select() at least once,
- * to avoid any issues if a short timeout is reached before
- * select() is even run.
- */
- if (started && timeout_check(&timeout))
+
+ if (timeout_check(&timeout))
break;
result = select(port->fd + 1, NULL, &fds, NULL, timeout_timeval(&timeout));
- started = 1;
+
+ timeout_update(&timeout);
+
if (result < 0) {
if (errno == EINTR) {
DEBUG("select() call was interrupted, repeating");
@@ -1152,7 +1047,6 @@ SP_API enum sp_return sp_blocking_read(struct sp_port *port, void *buf,
size_t bytes_read = 0;
unsigned char *ptr = (unsigned char *) buf;
struct timeout timeout;
- int started = 0;
fd_set fds;
int result;
@@ -1163,17 +1057,15 @@ SP_API enum sp_return sp_blocking_read(struct sp_port *port, void *buf,
/* Loop until we have the requested number of bytes. */
while (bytes_read < count) {
- /*
- * Check timeout only if we have run select() at least once,
- * to avoid any issues if a short timeout is reached before
- * select() is even run.
- */
- if (started && timeout_check(&timeout))
+
+ if (timeout_check(&timeout))
/* Timeout has expired. */
break;
result = select(port->fd + 1, &fds, NULL, NULL, timeout_timeval(&timeout));
- started = 1;
+
+ timeout_update(&timeout);
+
if (result < 0) {
if (errno == EINTR) {
DEBUG("select() call was interrupted, repeating");
@@ -1278,7 +1170,6 @@ SP_API enum sp_return sp_blocking_read_next(struct sp_port *port, void *buf,
#else
size_t bytes_read = 0;
struct timeout timeout;
- int started = 0;
fd_set fds;
int result;
@@ -1289,17 +1180,15 @@ SP_API enum sp_return sp_blocking_read_next(struct sp_port *port, void *buf,
/* Loop until we have at least one byte, or timeout is reached. */
while (bytes_read == 0) {
- /*
- * Check timeout only if we have run select() at least once,
- * to avoid any issues if a short timeout is reached before
- * select() is even run.
- */
- if (started && timeout_check(&timeout))
+
+ if (timeout_check(&timeout))
/* Timeout has expired. */
break;
result = select(port->fd + 1, &fds, NULL, NULL, timeout_timeval(&timeout));
- started = 1;
+
+ timeout_update(&timeout);
+
if (result < 0) {
if (errno == EINTR) {
DEBUG("select() call was interrupted, repeating");
@@ -1550,7 +1439,7 @@ SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
RETURN_OK();
#else
struct timeout timeout;
- int started = 0, result;
+ int result;
struct pollfd *pollfds;
unsigned int i;
@@ -1570,21 +1459,19 @@ SP_API enum sp_return sp_wait(struct sp_event_set *event_set,
}
timeout_start(&timeout, timeout_ms);
+ timeout_limit(&timeout, INT_MAX);
/* Loop until an event occurs. */
while (1) {
- /*
- * Check timeout only if we have run poll() at least once,
- * to avoid any issues if a short timeout is reached before
- * poll() is even run.
- */
- if (started && timeout_check(&timeout)) {
+
+ if (timeout_check(&timeout)) {
DEBUG("Wait timed out");
break;
}
- result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout));
- started = 1;
+ result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout) || -1);
+
+ timeout_update(&timeout);
if (result < 0) {
if (errno == EINTR) {