Fix bug affecting SubProcesses and multithreading

SubProcesses should and do have eventSetupForInstance called from the EventProcessor via the EventSetupsController. This fix removes the old call from the SubProcess class which should have been removed and creates data races when multiple streams are running.
cms-sw · Feb 12, 2018 · ecb39db · ecb39db
1 parent dcdf367
commit ecb39db
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/FWCore/Framework/src/SubProcess.cc b/FWCore/Framework/src/SubProcess.cc
@@ -437,7 +437,7 @@ namespace edm {
                                        *schedule_,
                                        rp,
                                        ts,
-                                       esp_->eventSetupForInstance(ts),
+                                       esp_->eventSetup(),
                                        serviceToken_,
                                        subProcesses_);
   }
@@ -455,7 +455,7 @@ namespace edm {
                                      *schedule_,
                                      rp,
                                      ts,
-                                     esp_->eventSetupForInstance(ts),
+                                     esp_->eventSetup(),
                                      serviceToken_,
                                      subProcesses_,
                                      cleaningUpAfterException);
@@ -500,7 +500,7 @@ namespace edm {
                                        *schedule_,
                                        lbp,
                                        ts,
-                                       esp_->eventSetupForInstance(ts),
+                                       esp_->eventSetup(),
                                        serviceToken_,
                                        subProcesses_);
   }
@@ -515,7 +515,7 @@ namespace edm {
                                      *schedule_,
                                      lbp,
                                      ts,
-                                     esp_->eventSetupForInstance(ts),
+                                     esp_->eventSetup(),
                                      serviceToken_,
                                      subProcesses_,
                                      cleaningUpAfterException);
@@ -566,7 +566,7 @@ namespace edm {
                                        id,
                                        rp,
                                        ts,
-                                       esp_->eventSetupForInstance(ts),
+                                       esp_->eventSetup(),
                                        serviceToken_,
                                        subProcesses_);
 
@@ -584,7 +584,7 @@ namespace edm {
                                        id,
                                        rp,
                                        ts,
-                                       esp_->eventSetupForInstance(ts),
+                                       esp_->eventSetup(),
                                        serviceToken_,
                                        subProcesses_,
                                      cleaningUpAfterException);
@@ -602,7 +602,7 @@ namespace edm {
                                        id,
                                        lbp,
                                        ts,
-                                       esp_->eventSetupForInstance(ts),
+                                       esp_->eventSetup(),
                                        serviceToken_,
                                        subProcesses_);
   }
@@ -619,7 +619,7 @@ namespace edm {
                                        id,
                                        lbp,
                                        ts,
-                                       esp_->eventSetupForInstance(ts),
+                                       esp_->eventSetup(),
                                        serviceToken_,
                                        subProcesses_,
                                        cleaningUpAfterException);