fix shm_manager use of resource conflicts

fengjingchao-cn · ycool · commit 039a5c0b1166 · 2017-12-20T11:53:41.000-08:00
diff --git a/ros/ros_comm/roscpp/src/libros/shm_manager.cpp b/ros/ros_comm/roscpp/src/libros/shm_manager.cpp
@@ -118,15 +118,14 @@ void ShmManager::shutdown()
 void ShmManager::threadFunc()
 {
   sharedmem_transport::SharedMemoryUtil sharedmem_util;
-  L_Subscription subs;
-  L_Subscription::iterator it;
   std::string topic;
 
   while (started_ && ros::ok())
   {
     if (TopicManager::instance()->getNumSubscriptions() > 0)
     {
-      subs = TopicManager::instance()->getAllSubscription();
+      L_Subscription subs = TopicManager::instance()->getAllSubscription();
+      L_Subscription::iterator it;
       if (!g_config_comm.transport_mode && 
         shm_map_.size() < TopicManager::instance()->getNumSubscriptions())
       {

Original file line number	Diff line number	Diff line change
`@@ -118,15 +118,14 @@ void ShmManager::shutdown()`
`118`	`118`	`void ShmManager::threadFunc()`
`119`	`119`	`{`
`120`	`120`	`sharedmem_transport::SharedMemoryUtil sharedmem_util;`
`121`		`- L_Subscription subs;`
`122`		`- L_Subscription::iterator it;`
`123`	`121`	`std::string topic;`
`124`	`122`
`125`	`123`	`while (started_ && ros::ok())`
`126`	`124`	`{`
`127`	`125`	`if (TopicManager::instance()->getNumSubscriptions() > 0)`
`128`	`126`	`{`
`129`		`- subs = TopicManager::instance()->getAllSubscription();`
	`127`	`+ L_Subscription subs = TopicManager::instance()->getAllSubscription();`
	`128`	`+ L_Subscription::iterator it;`
`130`	`129`	`if (!g_config_comm.transport_mode &&`
`131`	`130`	`shm_map_.size() < TopicManager::instance()->getNumSubscriptions())`
`132`	`131`	`{`