Merge pull request #4198 from wmtan/AvoidThreadLocals

Avoid thread locals.
cms-sw · Jun 11, 2014 · ebc64aa · ebc64aa
2 parents 5d5349b + baec0ff
commit ebc64aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/FWCore/Utilities/BuildFile.xml b/FWCore/Utilities/BuildFile.xml
@@ -4,6 +4,7 @@
 <use   name="rootcintex"/>
 <use   name="rootcore"/>
 <use   name="rootrflx"/>
+<use   name="tbb"/>
 <use   name="libuuid"/>
 <export>
   <lib   name="1"/>

diff --git a/FWCore/Utilities/src/FriendlyName.cc b/FWCore/Utilities/src/FriendlyName.cc
@@ -8,7 +8,7 @@
 #include <string>
 #include <boost/regex.hpp>
 #include <iostream>
-#include <map>
+#include "tbb/concurrent_unordered_map.h"
 
 //NOTE:  This should probably be rewritten so that we break the class name into a tree where the template arguments are the node.  On the way down the tree
 // we look for '<' or ',' and on the way up (caused by finding a '>') we can apply the transformation to the output string based on the class name for the
@@ -133,8 +133,8 @@ namespace edm {
        return result;
     }
     std::string friendlyName(std::string const& iFullName) {
-       typedef std::map<std::string, std::string> Map;
-       static thread_local Map s_fillToFriendlyName;
+       typedef tbb::concurrent_unordered_map<std::string, std::string> Map;
+       static Map s_fillToFriendlyName;
        auto itFound = s_fillToFriendlyName.find(iFullName);
        if(s_fillToFriendlyName.end()==itFound) {
           itFound = s_fillToFriendlyName.insert(Map::value_type(iFullName, handleNamespaces(subFriendlyName(standardRenames(iFullName))))).first;

diff --git a/FWCore/Utilities/src/TypeID.cc b/FWCore/Utilities/src/TypeID.cc
@@ -2,8 +2,8 @@
 
 ----------------------------------------------------------------------*/
 #include <cassert>
-#include <map>
 #include <ostream>
+#include "tbb/concurrent_unordered_map.h"
 #include "FWCore/Utilities/interface/TypeID.h"
 #include "FWCore/Utilities/interface/FriendlyName.h"
 #include "FWCore/Utilities/interface/Exception.h"
@@ -34,11 +34,18 @@ namespace {
     }
   }
 }
+  struct TypeIDHasher {
+    size_t operator()(TypeID const& tid) const {
+      tbb::tbb_hash<std::string> hasher;
+      return hasher(std::string(tid.name()));
+    }
+  };
+
 
   std::string const&
   TypeID::className() const {
-    typedef std::map<edm::TypeID, std::string> Map;
-    static thread_local Map s_typeToName;
+    typedef tbb::concurrent_unordered_map<edm::TypeID, std::string, TypeIDHasher> Map;
+    static Map s_typeToName;
 
     auto itFound = s_typeToName.find(*this);
     if(s_typeToName.end() == itFound) {