Fix publisher pool size (#152) (#154)

mergify[bot] · pablogs9 · web-flow · commit e483ca62ff3d · 2021-07-26T11:58:37.000+02:00
* Fix publisher pool size * Update (cherry picked from commit adfb3cf) Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
diff --git a/rmw_microxrcedds_c/src/config.h.in b/rmw_microxrcedds_c/src/config.h.in
@@ -44,7 +44,7 @@
 
 #define RMW_UXRCE_MAX_SESSIONS @RMW_UXRCE_MAX_SESSIONS@
 #define RMW_UXRCE_MAX_NODES @RMW_UXRCE_MAX_NODES@
-#define RMW_UXRCE_MAX_PUBLISHERS @RMW_UXRCE_MAX_PUBLISHERS@ + @RMW_UXRCE_MAX_NODES@
+#define RMW_UXRCE_MAX_PUBLISHERS @RMW_UXRCE_MAX_PUBLISHERS@
 #define RMW_UXRCE_MAX_SUBSCRIPTIONS @RMW_UXRCE_MAX_SUBSCRIPTIONS@
 #define RMW_UXRCE_MAX_SERVICES @RMW_UXRCE_MAX_SERVICES@
 #define RMW_UXRCE_MAX_CLIENTS @RMW_UXRCE_MAX_CLIENTS@
diff --git a/rmw_microxrcedds_c/src/types.c b/rmw_microxrcedds_c/src/types.c
@@ -41,7 +41,7 @@ rmw_uxrce_mempool_t node_memory;
 rmw_uxrce_node_t custom_nodes[RMW_UXRCE_MAX_NODES];
 
 rmw_uxrce_mempool_t publisher_memory;
-rmw_uxrce_publisher_t custom_publishers[RMW_UXRCE_MAX_PUBLISHERS + RMW_UXRCE_MAX_NODES];
+rmw_uxrce_publisher_t custom_publishers[RMW_UXRCE_MAX_PUBLISHERS];
 
 rmw_uxrce_mempool_t subscription_memory;
 rmw_uxrce_subscription_t custom_subscriptions[RMW_UXRCE_MAX_SUBSCRIPTIONS];
diff --git a/rmw_microxrcedds_c/src/types.h b/rmw_microxrcedds_c/src/types.h
@@ -211,7 +211,7 @@ extern rmw_uxrce_mempool_t node_memory;
 extern rmw_uxrce_node_t custom_nodes[RMW_UXRCE_MAX_NODES];
 
 extern rmw_uxrce_mempool_t publisher_memory;
-extern rmw_uxrce_publisher_t custom_publishers[RMW_UXRCE_MAX_PUBLISHERS + RMW_UXRCE_MAX_NODES];
+extern rmw_uxrce_publisher_t custom_publishers[RMW_UXRCE_MAX_PUBLISHERS];
 
 extern rmw_uxrce_mempool_t subscription_memory;
 extern rmw_uxrce_subscription_t custom_subscriptions[RMW_UXRCE_MAX_SUBSCRIPTIONS];
diff --git a/rmw_microxrcedds_c/test/test_topic.cpp b/rmw_microxrcedds_c/test/test_topic.cpp
@@ -44,7 +44,7 @@ class TestTopic : public RMWBaseTest
   }
 
   rmw_node_t * node;
-  const size_t attempts = 10;
+  const size_t attempts = RMW_UXRCE_MAX_TOPICS_INTERNAL;
   size_t id_gen = 0;
 
   const char * topic_type = "topic_type";

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class TestTopic : public RMWBaseTest`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`rmw_node_t * node;`
`47`		`- const size_t attempts = 10;`
	`47`	`+ const size_t attempts = RMW_UXRCE_MAX_TOPICS_INTERNAL;`
`48`	`48`	`size_t id_gen = 0;`
`49`	`49`
`50`	`50`	`const char * topic_type = "topic_type";`