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

update usage of rmw_waitset to reflect recent changes

Browse source
This commit is contained in:
William Woodall 2016-02-12 00:40:03 -08:00
parent b056b74eba
commit a48ba5e1db
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rcl/include/rcl/wait.h
View file

@ -79,6 +79,8 @@ rcl_get_zero_initialized_wait_set(void);
* ret = rcl_wait_set_fini(&wait_set); * ret = rcl_wait_set_fini(&wait_set);
* // ... error handling * // ... error handling
* *
* \TODO(wjwwood): consider the "fixed guard conditions", a la rmw's wait set.
*
* This function is thread-safe for different wait_set objects. * This function is thread-safe for different wait_set objects.
* Thread-safety of this function requires a thread-safe allocator if the * Thread-safety of this function requires a thread-safe allocator if the
* allocator is shared with other parts of the system. * allocator is shared with other parts of the system.
@ -297,7 +299,7 @@ rcl_wait_set_resize_timers(rcl_wait_set_t * wait_set, size_t size);
* rcl_subscription_t sub2; // initialize this, see rcl_subscription_init() * rcl_subscription_t sub2; // initialize this, see rcl_subscription_init()
* rcl_guard_condition_t gc1; // initialize this, see rcl_guard_condition_init() * rcl_guard_condition_t gc1; // initialize this, see rcl_guard_condition_init()
* rcl_wait_set_t wait_set = rcl_get_zero_initialized_wait_set(); * rcl_wait_set_t wait_set = rcl_get_zero_initialized_wait_set();
* rcl_ret_t ret = rcl_wait_set_init(&wait_set, 2, 1, rcl_get_default_allocator()); * rcl_ret_t ret = rcl_wait_set_init(&wait_set, 2, 1, 0, rcl_get_default_allocator());
* // ... error handling * // ... error handling
* do { * do {
* ret = rcl_wait_set_clear_subscriptions(&wait_set); * ret = rcl_wait_set_clear_subscriptions(&wait_set);