niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle negative timeout (#43)

Browse source
This commit is contained in:
Jackie Kay 2016-04-14 13:18:22 -07:00
parent 3f886e075f
commit b7ac94be43
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rcl/src/rcl/wait.c
View file

@ -521,12 +521,10 @@ rcl_wait(rcl_wait_set_t * wait_set, int64_t timeout)
temporary_timeout_storage.sec = 0; temporary_timeout_storage.sec = 0;
temporary_timeout_storage.nsec = 0; temporary_timeout_storage.nsec = 0;
timeout_argument = &temporary_timeout_storage; timeout_argument = &temporary_timeout_storage;
} else { } else if (timeout > 0) {
int64_t min_timeout = INT64_MAX; int64_t min_timeout = INT64_MAX;
if (timeout > 0) { // Compare the timeout to the time until next callback for each timer.
// Compare the timeout to the time until next callback for each timer. min_timeout = timeout;
min_timeout = timeout;
}
// Take the lowest and use that for the wait timeout. // Take the lowest and use that for the wait timeout.
uint64_t i = 0; uint64_t i = 0;
for (i = 0; i < wait_set->size_of_timers; ++i) { for (i = 0; i < wait_set->size_of_timers; ++i) {