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

Fix wait allocation cleanup (#770)

Browse source 
* Add fix wait.c init/fini allocation on error
* Add test for the fix
* Remove unit tests

Signed-off-by: Jorge Perez <jjperez@ekumenlabs.com>
This commit is contained in:
Jorge Perez 2020-08-31 13:11:43 -03:00 • committed by Alejandro Hernández Cordero
parent 907a93dacc
commit af60a36853
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,13 +86,13 @@ rcl_wait_set_is_valid(const rcl_wait_set_t * wait_set)
} }
static void static void
__wait_set_clean_up(rcl_wait_set_t * wait_set, rcl_allocator_t allocator) __wait_set_clean_up(rcl_wait_set_t * wait_set)
{ {
rcl_ret_t ret = rcl_wait_set_resize(wait_set, 0, 0, 0, 0, 0, 0); rcl_ret_t ret = rcl_wait_set_resize(wait_set, 0, 0, 0, 0, 0, 0);
(void)ret; // NO LINT (void)ret; // NO LINT
assert(RCL_RET_OK == ret); // Defensive, shouldn't fail with size 0. assert(RCL_RET_OK == ret); // Defensive, shouldn't fail with size 0.
if (wait_set->impl) { if (wait_set->impl) {
allocator.deallocate(wait_set->impl, allocator.state); wait_set->impl->allocator.deallocate(wait_set->impl, wait_set->impl->allocator.state);
wait_set->impl = NULL; wait_set->impl = NULL;
} }
} }
@ -146,6 +146,10 @@ rcl_wait_set_init(
wait_set->impl->rmw_services.service_count = 0; wait_set->impl->rmw_services.service_count = 0;
wait_set->impl->rmw_events.events = NULL; wait_set->impl->rmw_events.events = NULL;
wait_set->impl->rmw_events.event_count = 0; wait_set->impl->rmw_events.event_count = 0;
// Set context.
wait_set->impl->context = context;
// Set allocator.
wait_set->impl->allocator = allocator;
size_t num_conditions = size_t num_conditions =
(2 * number_of_subscriptions) + (2 * number_of_subscriptions) +
@ -159,10 +163,6 @@ rcl_wait_set_init(
goto fail; goto fail;
} }
// Set context.
wait_set->impl->context = context;
// Set allocator.
wait_set->impl->allocator = allocator;
// Initialize subscription space. // Initialize subscription space.
rcl_ret_t ret = rcl_wait_set_resize( rcl_ret_t ret = rcl_wait_set_resize(
wait_set, number_of_subscriptions, number_of_guard_conditions, number_of_timers, wait_set, number_of_subscriptions, number_of_guard_conditions, number_of_timers,
@ -179,7 +179,7 @@ fail:
fail_ret = RCL_RET_WAIT_SET_INVALID; fail_ret = RCL_RET_WAIT_SET_INVALID;
} }
} }
__wait_set_clean_up(wait_set, allocator); __wait_set_clean_up(wait_set);
return fail_ret; return fail_ret;
} }
@ -195,7 +195,7 @@ rcl_wait_set_fini(rcl_wait_set_t * wait_set)
RCL_SET_ERROR_MSG(rmw_get_error_string().str); RCL_SET_ERROR_MSG(rmw_get_error_string().str);
result = RCL_RET_WAIT_SET_INVALID; result = RCL_RET_WAIT_SET_INVALID;
} }
__wait_set_clean_up(wait_set, wait_set->impl->allocator); __wait_set_clean_up(wait_set);
} }
return result; return result;
} }
@ -300,6 +300,7 @@ rcl_wait_set_get_allocator(const rcl_wait_set_t * wait_set, rcl_allocator_t * al
wait_set->impl->RMWStorage, sizeof(void *) * Type ## s_size, allocator.state); \ wait_set->impl->RMWStorage, sizeof(void *) * Type ## s_size, allocator.state); \
if (!wait_set->impl->RMWStorage) { \ if (!wait_set->impl->RMWStorage) { \
allocator.deallocate((void *)wait_set->Type ## s, allocator.state); \ allocator.deallocate((void *)wait_set->Type ## s, allocator.state); \
wait_set->Type ## s = NULL; \
wait_set->size_of_ ## Type ## s = 0; \ wait_set->size_of_ ## Type ## s = 0; \
RCL_SET_ERROR_MSG("allocating memory failed"); \ RCL_SET_ERROR_MSG("allocating memory failed"); \
return RCL_RET_BAD_ALLOC; \ return RCL_RET_BAD_ALLOC; \