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;
-};
-
-#define TIME_ZERO {.tv = {0, 0}}
-#define TIME_MS(ms) {.tv = {ms / 1000, (ms % 1000) * 1000}}
-
-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;
-}
-
-#endif
-
SP_API enum sp_return sp_get_port_by_name(const char *portname, struct sp_port **port_ptr)
{
struct sp_port *port;
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 time start, delta, now, end = TIME_ZERO;
- int started = 0;
+ struct timeout timeout;
fd_set fds;
int result;
- if (timeout_ms) {
- /* Get time at start of operation. */
- time_get(&start);
- /* Define duration of timeout. */
- time_set_ms(&delta, timeout_ms);
- /* Calculate time at which we should give up. */
- time_add(&start, &delta, &end);
- }
+ timeout_start(&timeout, timeout_ms);
FD_ZERO(&fds);
FD_SET(port->fd, &fds);
/* 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.
- */
- struct timeval tv;
- if (timeout_ms && started) {
- time_get(&now);
- if (time_greater(&now, &end))
- /* Timeout has expired. */
- break;
- time_sub(&end, &now, &delta);
- time_as_timeval(&delta, &tv);
- }
- result = select(port->fd + 1, NULL, &fds, NULL, timeout_ms ? &tv : NULL);
- started = 1;
+
+ if (timeout_check(&timeout))
+ break;
+
+ result = select(port->fd + 1, NULL, &fds, NULL, timeout_timeval(&timeout));
+
+ timeout_update(&timeout);
+
if (result < 0) {
if (errno == EINTR) {
DEBUG("select() call was interrupted, repeating");
#else
size_t bytes_read = 0;
unsigned char *ptr = (unsigned char *) buf;
- struct time start, delta, now, end = TIME_ZERO;
- int started = 0;
+ struct timeout timeout;
fd_set fds;
int result;
- if (timeout_ms) {
- /* Get time at start of operation. */
- time_get(&start);
- /* Define duration of timeout. */
- time_set_ms(&delta, timeout_ms);
- /* Calculate time at which we should give up. */
- time_add(&start, &delta, &end);
- }
+ timeout_start(&timeout, timeout_ms);
FD_ZERO(&fds);
FD_SET(port->fd, &fds);
/* 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.
- */
- struct timeval tv;
- if (timeout_ms && started) {
- time_get(&now);
- if (time_greater(&now, &end))
- /* Timeout has expired. */
- break;
- time_sub(&end, &now, &delta);
- time_as_timeval(&delta, &tv);
- }
- result = select(port->fd + 1, &fds, NULL, NULL, timeout_ms ? &tv : NULL);
- started = 1;
+
+ if (timeout_check(&timeout))
+ /* Timeout has expired. */
+ break;
+
+ result = select(port->fd + 1, &fds, NULL, NULL, timeout_timeval(&timeout));
+
+ timeout_update(&timeout);
+
if (result < 0) {
if (errno == EINTR) {
DEBUG("select() call was interrupted, repeating");
#else
size_t bytes_read = 0;
- struct time start, delta, now, end = TIME_ZERO;
- int started = 0;
+ struct timeout timeout;
fd_set fds;
int result;
- if (timeout_ms) {
- /* Get time at start of operation. */
- time_get(&start);
- /* Define duration of timeout. */
- time_set_ms(&delta, timeout_ms);
- /* Calculate time at which we should give up. */
- time_add(&start, &delta, &end);
- }
+ timeout_start(&timeout, timeout_ms);
FD_ZERO(&fds);
FD_SET(port->fd, &fds);
/* 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.
- */
- struct timeval tv;
- if (timeout_ms && started) {
- time_get(&now);
- if (time_greater(&now, &end))
- /* Timeout has expired. */
- break;
- time_sub(&end, &now, &delta);
- time_as_timeval(&delta, &tv);
- }
- result = select(port->fd + 1, &fds, NULL, NULL, timeout_ms ? &tv : NULL);
- started = 1;
+
+ if (timeout_check(&timeout))
+ /* Timeout has expired. */
+ break;
+
+ result = select(port->fd + 1, &fds, NULL, NULL, timeout_timeval(&timeout));
+
+ timeout_update(&timeout);
+
if (result < 0) {
if (errno == EINTR) {
DEBUG("select() call was interrupted, repeating");
RETURN_OK();
#else
- struct time start, delta, now, end = TIME_ZERO;
- const struct time max_delta = TIME_MS(INT_MAX);
- int started = 0, timeout_overflow = 0;
- int result, timeout_remaining_ms;
+ struct timeout timeout;
+ int result;
struct pollfd *pollfds;
unsigned int i;
pollfds[i].events |= POLLERR;
}
- if (timeout_ms) {
- /* Get time at start of operation. */
- time_get(&start);
- /* Define duration of timeout. */
- time_set_ms(&delta, timeout_ms);
- /* Calculate time at which we should give up. */
- time_add(&start, &delta, &end);
- }
+ 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 (!timeout_ms) {
- timeout_remaining_ms = -1;
- } else if (!started) {
- timeout_overflow = (timeout_ms > INT_MAX);
- timeout_remaining_ms = timeout_overflow ? INT_MAX : timeout_ms;
- } else {
- time_get(&now);
- if (time_greater(&now, &end)) {
- DEBUG("Wait timed out");
- break;
- }
- time_sub(&end, &now, &delta);
- if ((timeout_overflow = time_greater(&delta, &max_delta)))
- delta = max_delta;
- timeout_remaining_ms = time_as_ms(&delta);
+
+ if (timeout_check(&timeout)) {
+ DEBUG("Wait timed out");
+ break;
}
- result = poll(pollfds, event_set->count, timeout_remaining_ms);
- started = 1;
+ result = poll(pollfds, event_set->count, timeout_remaining_ms(&timeout) || -1);
+
+ timeout_update(&timeout);
if (result < 0) {
if (errno == EINTR) {
}
} else if (result == 0) {
DEBUG("poll() timed out");
- if (!timeout_overflow)
+ if (!timeout.overflow)
break;
} else {
DEBUG("poll() completed");
projects / libserialport.git / blobdiff