Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coap_io.c: Further cleanup of timeout checking code #1325

Merged
merged 1 commit into from
Feb 15, 2024
Merged

coap_io.c: Further cleanup of timeout checking code #1325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions src/coap_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1561,9 +1561,6 @@ coap_io_process_with_fds(coap_context_t *ctx, uint32_t timeout_ms,
timeout = coap_io_prepare_io(ctx, ctx->sockets,
(sizeof(ctx->sockets) / sizeof(ctx->sockets[0])),
&ctx->num_sockets, before);
if (timeout_ms != COAP_IO_NO_WAIT && timeout_ms != COAP_IO_WAIT &&
timeout_ms < timeout)
timeout = timeout_ms;

if (ereadfds) {
ctx->readfds = *ereadfds;
Expand Down Expand Up @@ -1604,8 +1601,11 @@ coap_io_process_with_fds(coap_context_t *ctx, uint32_t timeout_ms,
tv.tv_usec = 0;
tv.tv_sec = 0;
timeout = 1;
} else if (timeout > 0) {
/* Ignore timeout_ms == COAP_IO_WAIT as there is something coming up */
} else if (timeout == 0 && timeout_ms == COAP_IO_WAIT) {
;
} else {
if (timeout == 0 || timeout_ms < timeout)
timeout = timeout_ms;
tv.tv_usec = (timeout % 1000) * 1000;
tv.tv_sec = (long)(timeout / 1000);
}
Expand Down Expand Up @@ -1674,13 +1674,9 @@ coap_io_process_with_fds(coap_context_t *ctx, uint32_t timeout_ms,

timeout = coap_io_prepare_epoll(ctx, before);

if (timeout_ms != COAP_IO_NO_WAIT && timeout_ms != COAP_IO_WAIT &&
timeout_ms < timeout)
timeout = timeout_ms;

do {
struct epoll_event events[COAP_MAX_EPOLL_EVENTS];
int etimeout = timeout;
int etimeout;

/* Potentially adjust based on what the caller wants */
if (timeout_ms == COAP_IO_NO_WAIT) {
Expand All @@ -1692,12 +1688,17 @@ coap_io_process_with_fds(coap_context_t *ctx, uint32_t timeout_ms,
* so wait forever in epoll_wait().
*/
etimeout = -1;
} else if (etimeout < 0) {
/*
* If timeout > INT_MAX, epoll_wait() cannot wait longer than this as
* it has int timeout parameter
*/
etimeout = INT_MAX;
} else {
etimeout = timeout;
if (timeout == 0 || timeout_ms < timeout)
etimeout = timeout_ms;
if (etimeout < 0) {
/*
* If timeout > INT_MAX, epoll_wait() cannot wait longer than this as
* it has int timeout parameter
*/
etimeout = INT_MAX;
}
}

/* Unlock so that other threads can lock/update ctx */
Expand Down
Loading