Merge pull request #3578 from Dr15Jones/fixPrefetchForConcurrentModul…

…eTimer Multithreading -- Fix problems with prefetch and ConcurrentModuleTimer
cms-sw · Apr 30, 2014 · 8d1cfb9 · 8d1cfb9
2 parents c0c20b3 + 260aa06
commit 8d1cfb9
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/FWCore/Services/plugins/ConcurrentModuleTimer.cc b/FWCore/Services/plugins/ConcurrentModuleTimer.cc
@@ -20,6 +20,7 @@
 #include "FWCore/Utilities/interface/CPUTimer.h"
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 #include "FWCore/ServiceRegistry/interface/SystemBounds.h"
+#include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"
 
 
 namespace edm {
@@ -72,11 +73,15 @@ m_startedTiming(false)
     stop();
   });
 
-  iReg.watchPreModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const&){
-    stop();
+  iReg.watchPreModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext){
+      if(iContext.state() == ModuleCallingContext::State::kRunning) {
+	stop();
+      }
   });
-  iReg.watchPostModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const&){
-    start();
+  iReg.watchPostModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext){
+      if(iContext.state() == ModuleCallingContext::State::kRunning) {
+	start();
+      }
   });
 
   iReg.watchPreallocate([this](edm::service::SystemBounds const& iBounds){