fix shm handle shared resource crash bug

ApolloAuto · Dec 4, 2017 · 29d6b04 · 29d6b04
1 parent e3cf4a2
commit 29d6b04
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/ros/ros_comm/roscpp/include/ros/shm_manager.h b/ros/ros_comm/roscpp/include/ros/shm_manager.h
@@ -111,6 +111,8 @@ class ShmManager
   bool started_;
   boost::interprocess::interprocess_mutex shm_sub_mutex_;
   std::map<std::string, bool> shm_skip_first_msg_;
+  boost::mutex shm_map_mutex_;
+  boost::mutex shm_first_msg_map_mutex_;
 };
 
 }

diff --git a/ros/ros_comm/roscpp/src/libros/shm_manager.cpp b/ros/ros_comm/roscpp/src/libros/shm_manager.cpp
@@ -183,9 +183,13 @@ void ShmManager::threadFunc()
             item.datatype = sharedmem_util.get_datatype(segment);
             item.message_definition = sharedmem_util.get_msg_def(segment);
 
+            boost::mutex::scoped_lock lock(shm_map_mutex_);
+
             shm_map_[topic] = item;
           }
 
+          boost::mutex::scoped_lock lock(shm_first_msg_map_mutex_);
+
           if (shm_skip_first_msg_.find(topic) == shm_skip_first_msg_.end())
           {
             if (segment == NULL)
@@ -242,12 +246,21 @@ void ShmManager::threadFunc()
                   if (read_index == sharedmem_transport::ROS_SHM_SEGMENT_WROTE_NUM ||
                     shm_map_[topic].shm_sub_ptr->get_publisher_links().size() == 0)
                   {
-                    if (shm_map_[topic].addr_sub)
                     {
-                      delete [](shm_map_[topic].addr_sub);
+                      boost::mutex::scoped_lock lock(shm_map_mutex_);
+
+                      if (shm_map_[topic].addr_sub)
+                      {
+                        delete [](shm_map_[topic].addr_sub);
+                      }
+                      shm_map_.erase(topic);
+                    }
+
+                    {
+                      boost::mutex::scoped_lock lock(shm_first_msg_map_mutex_);
+                      shm_skip_first_msg_.erase(topic);
                     }
-                    shm_map_.erase(topic);
-                    shm_skip_first_msg_.erase(topic);
+
                     is_new_msg = false;
                     exit = true;
                   }