Skip to content
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

Jump to bottom

Reset RMWCount when DEALLOC rmw storage of wait set #209

Merged
merged 2 commits into from
Jan 23, 2018
Merged

Reset RMWCount when DEALLOC rmw storage of wait set #209

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6a3f7b
Reset RMWCount when DEALLOC rmw storage of wait set
jwang11 Jan 22, 2018
27c3380
setting RMWCount to 0 only when RMWStorage is set to NULL
jwang11 Jan 23, 2018
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
1 change: 1 addition & 0 deletions rcl/src/rcl/wait.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ rcl_wait_set_get_allocator(const rcl_wait_set_t * wait_set, rcl_allocator_t * al

#define SET_RESIZE_RMW_DEALLOC(RMWStorage) \
/* Also deallocate the rmw storage. */ \
wait_set->impl->RMWCount = 0; \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about setting this to 0 only when RMWStorage is set to NULL, so between line 323 and 324. In other this shouldn't be necessary.

if (wait_set->impl->RMWStorage) { \
allocator.deallocate((void *)wait_set->impl->RMWStorage, allocator.state); \
wait_set->impl->RMWStorage = NULL; \
Expand Down