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

Enable fastrtps for rcl (#32)

Browse source 
* Enable fastrtps

* Fix invalid timer access
This commit is contained in:
Esteve Fernandez 2016-06-22 03:02:52 +02:00 • committed by Jackie Kay
parent 5733d36ed2
commit 9bbe3666ac
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -530,7 +530,7 @@ rcl_wait(rcl_wait_set_t * wait_set, int64_t timeout)
// Compare the timeout to the time until next callback for each timer. // Compare the timeout to the time until next callback for each timer.
// 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->impl->timer_index; ++i) {
if (!wait_set->timers[i]) { if (!wait_set->timers[i]) {
continue; // Skip NULL timers. continue; // Skip NULL timers.
} }
@ -583,7 +583,7 @@ rcl_wait(rcl_wait_set_t * wait_set, int64_t timeout)
} }
// Check for ready timers next, and set not ready timers to NULL. // Check for ready timers next, and set not ready timers to NULL.
size_t i; size_t i;
for (i = 0; i < wait_set->size_of_timers; ++i) { for (i = 0; i < wait_set->impl->timer_index; ++i) {
bool is_ready = false; bool is_ready = false;
rcl_ret_t ret = rcl_timer_is_ready(wait_set->timers[i], &is_ready); rcl_ret_t ret = rcl_timer_is_ready(wait_set->timers[i], &is_ready);
if (ret != RCL_RET_OK) { if (ret != RCL_RET_OK) {

7
rcl/test/CMakeLists.txt
View file

@ -21,13 +21,6 @@ macro(test_target)
endmacro() endmacro()
function(test_target_function) function(test_target_function)
# TODO(wjwwood): remove these when C type support is supported by typesupport_introspection.
# after removing, we can also recombine the function and macro
if(rmw_implementation STREQUAL "rmw_fastrtps_cpp")
message(STATUS "Skipping tests for '${rmw_implementation}'")
return()
endif()
message(STATUS "Creating tests for '${rmw_implementation}'") message(STATUS "Creating tests for '${rmw_implementation}'")
# Gtests # Gtests