Skip to content

fix(wait): compute rmw_wait timeout in int64 to preserve infinite blocking [P2] #8

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

Merged
benaliabderrahmane merged 1 commit into from
Jun 5, 2026
Merged

fix(wait): compute rmw_wait timeout in int64 to preserve infinite blocking [P2] #8

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
17 changes: 12 additions & 5 deletions rmw_unix_socket_cpp/src/rmw_wait.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <chrono>
#include <cstring>
#include <limits>

#include <sys/epoll.h>
#include <sys/eventfd.h>
Expand Down Expand Up @@ -284,13 +285,19 @@ rmw_ret_t rmw_wait(
}
}

// Compute timeout
// Compute timeout. -1 means block forever (epoll_wait sentinel).
int timeout_ms = -1;
if (wait_timeout) {
timeout_ms = static_cast<int>(
wait_timeout->sec * 1000 + wait_timeout->nsec / 1000000);
if (timeout_ms == 0 && wait_timeout->nsec > 0) {
timeout_ms = 1; // At least 1ms
// Accumulate in int64_t; RMW_DURATION_INFINITE (~9.2e12 ms) overflows int.
int64_t ms = static_cast<int64_t>(wait_timeout->sec) * 1000 +
static_cast<int64_t>(wait_timeout->nsec) / 1000000;
if (ms > std::numeric_limits<int>::max()) {
timeout_ms = -1; // Infinite (or beyond epoll's range) -> block forever
} else {
timeout_ms = static_cast<int>(ms);
if (timeout_ms == 0 && wait_timeout->nsec > 0) {
timeout_ms = 1; // At least 1ms
}
}
}

Expand Down
Loading