cms-sw · ktf · Apr 28, 2014 · Oct 2, 2013 · Oct 3, 2013 · Oct 4, 2013
diff --git a/DQM/SiStripCommon/python/TkHistoMap_cfi.py b/DQM/SiStripCommon/python/TkHistoMap_cfi.py
@@ -1,4 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-TkDetMap = cms.Service("TkDetMap");
+#TkDetMap = cms.Service("TkDetMap");
 SiStripDetInfoFileReader = cms.Service("SiStripDetInfoFileReader");
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfigP5_Cosmic_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfigP5_Cosmic_cff.py
@@ -63,5 +63,5 @@
 TrackEffClient.AlgoName   = 'CKFTk'
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfigP5_HeavyIons_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfigP5_HeavyIons_cff.py
@@ -63,5 +63,5 @@
 TrackEffClient.AlgoName   = 'CKFTk'
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfigP5_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfigP5_cff.py
@@ -63,5 +63,5 @@
 TrackEffClient.AlgoName   = 'CKFTk'
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_Cosmic_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_Cosmic_cff.py
@@ -41,9 +41,11 @@
 TrackEffClient.AlgoName   = 'CKFTk'
 
 # Sequence
-SiStripCosmicDQMClient = cms.Sequence(siStripQTester*siStripOfflineAnalyser*TrackEffClient)
+#removed modules using TkDetMap
+#SiStripCosmicDQMClient = cms.Sequence(siStripQTester*siStripOfflineAnalyser*TrackEffClient)
+SiStripCosmicDQMClient = cms.Sequence(siStripQTester*TrackEffClient)
 
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader")
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_HeavyIons_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_HeavyIons_cff.py
@@ -33,8 +33,10 @@
 )
 
 # define new HI sequence
-SiStripOfflineDQMClientHI = cms.Sequence(siStripQTesterHI*siStripOfflineAnalyser)
+#removed modules using TkDetMap
+#SiStripOfflineDQMClientHI = cms.Sequence(siStripQTesterHI*siStripOfflineAnalyser)
+SiStripOfflineDQMClientHI = cms.Sequence(siStripQTesterHI)
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader")
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py
@@ -39,9 +39,11 @@
 
 
 # Sequence
-SiStripOfflineDQMClient = cms.Sequence(siStripQTester*siStripOfflineAnalyser)
+#removed modules using TkDetMap
+#SiStripOfflineDQMClient = cms.Sequence(siStripQTester*siStripOfflineAnalyser)
+SiStripOfflineDQMClient = cms.Sequence(siStripQTester)
 
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader")
diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfig_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfig_cff.py
@@ -82,5 +82,5 @@
 SiStripOfflineDQMClient = cms.Sequence(offlineAnalyser)
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 
diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigP5_cff.py
@@ -205,5 +205,5 @@
 TrackEffMon_hi.FolderName                          = 'Tracking/TrackParameters/TrackEfficiency'
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader")
diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_Cosmic_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_Cosmic_cff.py
@@ -170,7 +170,7 @@
 )
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader")
 
 # Event History Producer
@@ -182,8 +182,12 @@
 # Sequences 
 SiStripDQMTier0_cosmicTk = cms.Sequence(APVPhases*consecutiveHEs*SiStripMonitorTrack_cosmicTk*MonitorTrackResiduals_cosmicTk*TrackMon_cosmicTk*TrackEffMon_cosmicTk)
 
-SiStripDQMTier0_ckf = cms.Sequence(APVPhases*consecutiveHEs*SiStripMonitorTrack_ckf*MonitorTrackResiduals_ckf*TrackMon_ckf*TrackEffMon_ckf)
+#removed modules using TkDetMap
+#SiStripDQMTier0_ckf = cms.Sequence(APVPhases*consecutiveHEs*SiStripMonitorTrack_ckf*MonitorTrackResiduals_ckf*TrackMon_ckf*TrackEffMon_ckf)
+SiStripDQMTier0_ckf = cms.Sequence(APVPhases*consecutiveHEs*MonitorTrackResiduals_ckf*TrackMon_ckf*TrackEffMon_ckf)
 
 #SiStripDQMTier0_rs = cms.Sequence(APVPhases*consecutiveHEs*SiStripMonitorTrack_rs*MonitorTrackResiduals_rs*TrackMon_rs*TrackEffMon_rs)
 
-SiStripDQMTier0 = cms.Sequence(APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrack_ckf*MonitorTrackResiduals_ckf*TrackMon_cosmicTk*TrackMon_ckf*TrackEffMon_ckf*TrackSplitMonitor*dqmInfoSiStrip)
+#removed modules using TkDetMap
+#SiStripDQMTier0 = cms.Sequence(APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrack_ckf*MonitorTrackResiduals_ckf*TrackMon_cosmicTk*TrackMon_ckf*TrackEffMon_ckf*TrackSplitMonitor*dqmInfoSiStrip)
+SiStripDQMTier0 = cms.Sequence(APVPhases*consecutiveHEs*siStripFEDCheck*MonitorTrackResiduals_ckf*TrackMon_cosmicTk*TrackMon_ckf*TrackEffMon_ckf*TrackSplitMonitor*dqmInfoSiStrip)
diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_HeavyIons_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_HeavyIons_cff.py
@@ -23,9 +23,14 @@
 TrackMon_hi.FolderName          = 'Tracking/TrackParameters'
 TrackMon_hi.BSFolderName        = 'Tracking/TrackParameters/BeamSpotParameters'
 
+#removed all modules using TkDetMap service
+#SiStripDQMTier0_hi = cms.Sequence(APVPhases * consecutiveHEs *
+#                                  siStripFEDCheck * siStripFEDMonitor *
+#                                  SiStripMonitorDigi * SiStripMonitorCluster *
+#                                  SiStripMonitorTrack_hi *
+#                                  MonitorTrackResiduals_hi *
+#                                  TrackMon_hi)
 SiStripDQMTier0_hi = cms.Sequence(APVPhases * consecutiveHEs *
-                                  siStripFEDCheck * siStripFEDMonitor *
-                                  SiStripMonitorDigi * SiStripMonitorCluster *
-                                  SiStripMonitorTrack_hi *
+                                  siStripFEDCheck * 
                                   MonitorTrackResiduals_hi *
                                   TrackMon_hi)
diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py
@@ -109,7 +109,7 @@
 )
 
 # Services needed for TkHistoMap
-TkDetMap = cms.Service("TkDetMap")
+#TkDetMap = cms.Service("TkDetMap")
 SiStripDetInfoFileReade = cms.Service("SiStripDetInfoFileReader")
 
 # Event History Producer
@@ -122,18 +122,33 @@
 from RecoLuminosity.LumiProducer.lumiProducer_cff import *
 
 # Sequence
+#removed modules using TkDetMap service
+#SiStripDQMTier0 = cms.Sequence(
+#    APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX
+#    *SiStripMonitorTrackCommon*MonitorTrackResiduals
+#    *dqmInfoSiStrip)
+
+#SiStripDQMTier0Common = cms.Sequence(
+#    APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX        
+#    *SiStripMonitorTrackCommon
+#    *dqmInfoSiStrip)
+
+#SiStripDQMTier0MinBias = cms.Sequence(
+#    APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX
+#    *SiStripMonitorTrackMB*MonitorTrackResiduals
+#    *dqmInfoSiStrip)
+
 SiStripDQMTier0 = cms.Sequence(
-    APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX
-    *SiStripMonitorTrackCommon*MonitorTrackResiduals
+    APVPhases*consecutiveHEs*siStripFEDCheck
+    *MonitorTrackResiduals
     *dqmInfoSiStrip)
 
 SiStripDQMTier0Common = cms.Sequence(
-    APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX        
-    *SiStripMonitorTrackCommon
+    APVPhases*consecutiveHEs*siStripFEDCheck
     *dqmInfoSiStrip)
 
 SiStripDQMTier0MinBias = cms.Sequence(
-    APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX
+    APVPhases*consecutiveHEs*siStripFEDCheck
     *SiStripMonitorTrackMB*MonitorTrackResiduals
     *dqmInfoSiStrip)
 
diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfig_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfig_cff.py
@@ -84,9 +84,13 @@
 TrackMonColl.AlgoName = 'CKFTk'
 TrackMonColl.doSeedParameterHistos = True
 # Sequences
-SiStripSourcesSimData = cms.Sequence(SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrackSim*MonitorTrackResidualsSim*TrackMonSim)
-SiStripSourcesRealData = cms.Sequence(SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrackReal*MonitorTrackResidualsReal*TrackMonReal)
-SiStripSourcesRealDataCollision = cms.Sequence(SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrackColl*MonitorTrackResidualsColl*TrackMonColl)
+#removed modules using TkDetMap service
+#SiStripSourcesSimData = cms.Sequence(SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrackSim*MonitorTrackResidualsSim*TrackMonSim)
+#SiStripSourcesRealData = cms.Sequence(SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrackReal*MonitorTrackResidualsReal*TrackMonReal)
+#SiStripSourcesRealDataCollision = cms.Sequence(SiStripMonitorDigi*SiStripMonitorCluster*SiStripMonitorTrackColl*MonitorTrackResidualsColl*TrackMonColl)
+SiStripSourcesSimData = cms.Sequence(SiStripMonitorTrackSim*MonitorTrackResidualsSim*TrackMonSim)
+SiStripSourcesRealData = cms.Sequence(SiStripMonitorTrackReal*MonitorTrackResidualsReal*TrackMonReal)
+SiStripSourcesRealDataCollision = cms.Sequence(SiStripMonitorTrackColl*MonitorTrackResidualsColl*TrackMonColl)
 
 
 

diff --git a/DQMServices/Core/python/DQM_cfg.py b/DQMServices/Core/python/DQM_cfg.py
@@ -3,10 +3,11 @@
 # needed backend
 from DQMServices.Core.DQMStore_cfi import *
 
-DQM = cms.Service("DQM",
-    debug = cms.untracked.bool(False),
-    publishFrequency = cms.untracked.double(5.0),
-    collectorPort = cms.untracked.int32(9090),
-    collectorHost = cms.untracked.string('localhost'),
-    filter = cms.untracked.string('')
-)
+#Temporarily remove for thread safety reasons
+#DQM = cms.Service("DQM",
+#    debug = cms.untracked.bool(False),
+#    publishFrequency = cms.untracked.double(5.0),
+#    collectorPort = cms.untracked.int32(9090),
+#    collectorHost = cms.untracked.string('localhost'),
+#    filter = cms.untracked.string('')
+#)
diff --git a/DataFormats/Common/interface/RefCoreStreamer.h b/DataFormats/Common/interface/RefCoreStreamer.h
@@ -15,6 +15,8 @@ namespace edm {
 
     void operator() (TBuffer &R__b, void *objp);
 
+    TClassStreamer* Generate() const;
+
   private:
     TClassRef cl_;
   };
@@ -24,7 +26,8 @@ namespace edm {
     explicit RefCoreWithIndexStreamer() : cl_("edm::RefCoreWithIndex"){}
 
     void operator() (TBuffer &R__b, void *objp);
-
+
+    TClassStreamer* Generate() const;
   private:
     TClassRef cl_;
   };

diff --git a/DataFormats/Common/src/RefCoreStreamer.cc b/DataFormats/Common/src/RefCoreStreamer.cc
@@ -63,7 +63,15 @@ namespace edm {
     }
   }
 
-
+  TClassStreamer*
+  RefCoreStreamer::Generate() const {
+    return new RefCoreStreamer(*this);
+  }
+
+  TClassStreamer*
+  RefCoreWithIndexStreamer::Generate() const {
+    return new RefCoreWithIndexStreamer(*this);
+  }
 
 
   void setRefCoreStreamer(bool resetAll) {

diff --git a/DataFormats/Streamer/interface/StreamedProductStreamer.h b/DataFormats/Streamer/interface/StreamedProductStreamer.h
@@ -10,6 +10,7 @@ namespace edm {
 
     void operator() (TBuffer &R__b, void *objp);
 
+    TClassStreamer* Generate() const;
   private:
     TClassRef cl_;
   };

diff --git a/DataFormats/Streamer/src/StreamedProductStreamer.cc b/DataFormats/Streamer/src/StreamedProductStreamer.cc
@@ -27,6 +27,11 @@ namespace edm {
       }
     }
   }
+
+  TClassStreamer*
+  StreamedProductStreamer::Generate() const {
+    return new StreamedProductStreamer(*this);
+  }
 
   void
   setStreamedProductStreamer() {

diff --git a/FWCore/Framework/interface/DataProxy.h b/FWCore/Framework/interface/DataProxy.h
@@ -20,6 +20,7 @@
 //
 
 // system include files
+#include <atomic>
 
 // user include files
 
@@ -37,7 +38,7 @@ namespace edm {
          virtual ~DataProxy();
 
          // ---------- const member functions ---------------------
-         bool cacheIsValid() const { return cacheIsValid_; }
+         bool cacheIsValid() const { return cacheIsValid_.load(std::memory_order_acquire); }
 
          void doGet(EventSetupRecord const& iRecord, DataKey const& iKey, bool iTransiently) const;
          void const* get(EventSetupRecord const&, DataKey const& iKey, bool iTransiently) const;
@@ -85,12 +86,11 @@ namespace edm {
          DataProxy(DataProxy const&); // stop default
 
          DataProxy const& operator=(DataProxy const&); // stop default
-         void setCacheIsValidAndAccessType(bool iTransientAccessOnly) const;
 
          // ---------- member data --------------------------------
-         mutable void const* cache_;
-         mutable bool cacheIsValid_;
-         mutable bool nonTransientAccessRequested_;
+         mutable void const* cache_; //protected by a global mutex
+         mutable std::atomic<bool> cacheIsValid_;
+         mutable std::atomic<bool> nonTransientAccessRequested_;
          ComponentDescription const* description_;
       };
    }

diff --git a/FWCore/Framework/interface/DelayedReader.h b/FWCore/Framework/interface/DelayedReader.h
@@ -16,20 +16,28 @@ namespace edm {
   struct BranchKey;
   class EDProductGetter;
   class WrapperInterfaceBase;
+  class SharedResourcesAcquirer;
   class DelayedReader {
   public:
     virtual ~DelayedReader();
-    WrapperOwningHolder getProduct(BranchKey const& k, WrapperInterfaceBase const* interface, EDProductGetter const* ep) {
-      return getProduct_(k, interface, ep);
-    }
+    WrapperOwningHolder getProduct(BranchKey const& k, WrapperInterfaceBase const* interface, EDProductGetter const* ep);
+
     void mergeReaders(DelayedReader* other) {mergeReaders_(other);}
     void reset() {reset_();}
+
+    SharedResourcesAcquirer* sharedResources() const {
+      return sharedResources_();
+    }
+
+
+
   private:
     virtual WrapperOwningHolder getProduct_(BranchKey const& k,
                                             WrapperInterfaceBase const* interface,
                                             EDProductGetter const* ep) const = 0;
     virtual void mergeReaders_(DelayedReader*) = 0;
     virtual void reset_() = 0;
+    virtual SharedResourcesAcquirer* sharedResources_() const;
   };
 }
 

diff --git a/FWCore/Framework/interface/EDAnalyzer.h b/FWCore/Framework/interface/EDAnalyzer.h
@@ -5,8 +5,10 @@
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 
 #include <string>
+#include <mutex>
 
 // EDAnalyzer is the base class for all analyzer "modules".
 
@@ -25,7 +27,7 @@ namespace edm {
     template <typename T> friend class WorkerT;
     typedef EDAnalyzer ModuleType;
 
-    EDAnalyzer() : moduleDescription_() {}
+    EDAnalyzer();
     virtual ~EDAnalyzer();
 
     std::string workerType() const {return "WorkerT<EDAnalyzer>";}
@@ -75,6 +77,8 @@ namespace edm {
       moduleDescription_ = md;
     }
     ModuleDescription moduleDescription_;
+    SharedResourcesAcquirer resourceAcquirer_;
+    std::mutex mutex_;
 
     std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
   };

diff --git a/FWCore/Framework/interface/EDFilter.h b/FWCore/Framework/interface/EDFilter.h
@@ -14,11 +14,14 @@ These products should be informational products about the filter decision.
 #include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
+
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 
 #include <string>
 #include <vector>
+#include <mutex>
 
 namespace edm {
   namespace maker {
@@ -34,9 +37,7 @@ namespace edm {
     template <typename T> friend class WorkerT;
     typedef EDFilter ModuleType;
 
-     EDFilter() : ProducerBase() , moduleDescription_(),
-     previousParentage_(), previousParentageId_() {
-    }
+    EDFilter();
     virtual ~EDFilter();
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
@@ -90,6 +91,8 @@ namespace edm {
     }
     ModuleDescription moduleDescription_;
     std::vector<BranchID> previousParentage_;
+    SharedResourcesAcquirer resourceAcquirer_;
+    std::mutex mutex_;
     ParentageID previousParentageId_;
   };
 }