put a lock infront of the clear function to make it threadsafe

Project-OSRM · Apr 2, 2018 · 01e6562 · 01e6562
1 parent f39e37a
commit 01e6562
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/engine/search_engine_data.hpp b/include/engine/search_engine_data.hpp
@@ -6,7 +6,8 @@
 #include "util/query_heap.hpp"
 #include "util/typedefs.hpp"
 
-#include <boost/thread/tss.hpp>
+// #include <boost/thread/tss.hpp>
+#include <boost/thread.hpp>
 
 namespace osrm
 {
@@ -57,6 +58,8 @@ template <> struct SearchEngineData<routing_algorithms::ch::Algorithm>
     static ManyToManyHeapPtr many_to_many_heap;
     static UnpackingCache unpacking_cache;
 
+    boost::shared_mutex _shared_access_across_threads;
+
     void InitializeOrClearFirstThreadLocalStorage(unsigned number_of_nodes);
 
     void InitializeOrClearSecondThreadLocalStorage(unsigned number_of_nodes);

diff --git a/src/engine/search_engine_data.cpp b/src/engine/search_engine_data.cpp
@@ -93,6 +93,7 @@ void SearchEngineData<CH>::InitializeOrClearManyToManyThreadLocalStorage(unsigne
 
 void SearchEngineData<CH>::InitializeOrClearUnpackingCacheGlobalStorage(unsigned timestamp)
 {
+    boost::unique_lock<boost::shared_mutex> lock(_shared_access_across_threads);
     unpacking_cache.Clear(timestamp);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     void SearchEngineData<CH>::InitializeOrClearUnpackingCacheGlobalStorage(unsigned timestamp)
     {
+        boost::unique_lock<boost::shared_mutex> lock(_shared_access_across_threads);
         unpacking_cache.Clear(timestamp);
     }
@@ Expand Down @@