Reset RMWCount when DEALLOC rmw storage of wait set (#209)

jwang11 · dirk-thomas · commit 1d35c60c7b51 · 2018-01-22T21:57:09.000-08:00
* Reset RMWCount when DEALLOC rmw storage of wait set

It is safe to reset RMWCount when free rmw storage of wait set

Signed-off-by: jwang &lt;jing.j.wang@intel.com&gt;

* setting RMWCount to 0 only when RMWStorage is set to NULL

Signed-off-by: jwang &lt;jing.j.wang@intel.com&gt;
diff --git a/rcl/src/rcl/wait.c b/rcl/src/rcl/wait.c
@@ -320,6 +320,7 @@ rcl_wait_set_get_allocator(const rcl_wait_set_t * wait_set, rcl_allocator_t * al
   if (wait_set->impl->RMWStorage) { \
     allocator.deallocate((void *)wait_set->impl->RMWStorage, allocator.state); \
     wait_set->impl->RMWStorage = NULL; \
+    wait_set->impl->RMWCount = 0; \
   }
 
 #define SET_RESIZE_RMW_REALLOC(Type, RMWStorage, RMWCount) \

Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,7 @@ rcl_wait_set_get_allocator(const rcl_wait_set_t * wait_set, rcl_allocator_t * al`
`320`	`320`	`if (wait_set->impl->RMWStorage) { \`
`321`	`321`	`allocator.deallocate((void *)wait_set->impl->RMWStorage, allocator.state); \`
`322`	`322`	`wait_set->impl->RMWStorage = NULL; \`
	`323`	`+ wait_set->impl->RMWCount = 0; \`
`323`	`324`	`}`
`324`	`325`
`325`	`326`	`#define SET_RESIZE_RMW_REALLOC(Type, RMWStorage, RMWCount) \`