Merge pull request #1085 from Dr15Jones/clearEventSelectorThreadSafely

Multithreaded framework -- Clear the event selector in a thread safe manner
cms-sw · Oct 17, 2013 · a6043d1 · a6043d1
2 parents ae1032b + 35964b0
commit a6043d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/FWCore/Framework/src/OutputModule.cc b/FWCore/Framework/src/OutputModule.cc
@@ -180,12 +180,12 @@ namespace edm {
   OutputModule::doEvent(EventPrincipal const& ep,
                         EventSetup const&,
                         ModuleCallingContext const* mcc) {
-    detail::TRBESSentry products_sentry(selectors_);
 
     FDEBUG(2) << "writeEvent called\n";
 
     {
       std::lock_guard<std::mutex> guard(mutex_);
+      detail::TRBESSentry products_sentry(selectors_);
       if(!wantAllEvents_) {
         if(!selectors_.wantEvent(ep, mcc)) {
           return true;

diff --git a/FWCore/Framework/src/one/OutputModuleBase.cc b/FWCore/Framework/src/one/OutputModuleBase.cc
@@ -187,10 +187,10 @@ namespace edm {
     OutputModuleBase::doEvent(EventPrincipal const& ep,
                               EventSetup const&,
                               ModuleCallingContext const* mcc) {
-      detail::TRBESSentry products_sentry(selectors_);
 
       {
         std::lock_guard<std::mutex> guard(mutex_);
+        detail::TRBESSentry products_sentry(selectors_);
         if(!wantAllEvents_) {
           if(!selectors_.wantEvent(ep, mcc)) {
             return true;