Merge pull request #3756 from wmtan/ConcurrentUnorderedMap

Use concurrent unordered map for thread safety
cms-sw · May 8, 2014 · 57a35ee · 57a35ee
2 parents 8e25092 + e6043bc
commit 57a35ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/FWCore/Utilities/BuildFile.xml b/FWCore/Utilities/BuildFile.xml
@@ -3,6 +3,7 @@
 <use   name="boost_regex"/>
 <use   name="rootcore"/>
 <use   name="libuuid"/>
+<use   name="tbb"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/FWCore/Utilities/src/TypeWithDict.cc b/FWCore/Utilities/src/TypeWithDict.cc
@@ -18,6 +18,8 @@
 
 #include "boost/thread/tss.hpp"
 
+#include "tbb/concurrent_unordered_map.h"
+
 #include <cassert>
 #include <cstdio>
 #include <cstdlib>
@@ -35,8 +37,7 @@ namespace edm {
     //       ignores those properties, so we must store them
     //       separately.
 
-    // Yes, I know this is not thread safe
-    typedef std::map<std::string, TypeWithDict> TypeMap;
+    typedef tbb::concurrent_unordered_map<std::string, TypeWithDict> TypeMap;
     static TypeMap typeMap;
     TypeMap::const_iterator it = typeMap.find(name);
     if(it != typeMap.end()) {