Move module finalization to ModuleRegistry

Author: Dr15Jones

FWCore/Framework/interface/ModuleRegistry.h

@@ -104,6 +104,11 @@ namespace edm {
       }
     }
 
+    void finishModulesInitialization(ProductRegistry const& iRegistry,
+                                     eventsetup::ESRecordsToProductResolverIndices const& iESIndices,
+                                     ProcessBlockHelperBase const& processBlockHelperBase,
+                                     std::string const& processName);
+
   private:
     std::map<std::string, edm::propagate_const<std::shared_ptr<maker::ModuleHolder>>> labelToModule_;
     ModuleTypeResolverMaker const* typeResolverMaker_;

FWCore/Framework/src/ModuleRegistry.cc

@@ -15,6 +15,7 @@
 // user include files
 #include "FWCore/Framework/interface/ModuleRegistry.h"
 #include "FWCore/Framework/src/ModuleHolderFactory.h"
+#include "DataFormats/Provenance/interface/ProductResolverIndexHelper.h"
 
 namespace edm {
   std::shared_ptr<maker::ModuleHolder> ModuleRegistry::getModule(
@@ -87,4 +88,32 @@ namespace edm {
       throw;
     }
   }
+
+  void ModuleRegistry::finishModulesInitialization(ProductRegistry const& iRegistry,
+                                                   eventsetup::ESRecordsToProductResolverIndices const& iESIndices,
+                                                   ProcessBlockHelperBase const& processBlockHelperBase,
+                                                   std::string const& processName) {
+    auto const processBlockLookup = iRegistry.productLookup(InProcess);
+    auto const runLookup = iRegistry.productLookup(InRun);
+    auto const lumiLookup = iRegistry.productLookup(InLumi);
+    auto const eventLookup = iRegistry.productLookup(InEvent);
+
+    auto processBlockModuleToIndicies = processBlockLookup->indiciesForModulesInProcess(processName);
+    auto runModuleToIndicies = runLookup->indiciesForModulesInProcess(processName);
+    auto lumiModuleToIndicies = lumiLookup->indiciesForModulesInProcess(processName);
+    auto eventModuleToIndicies = eventLookup->indiciesForModulesInProcess(processName);
+
+    forAllModuleHolders([&](auto& iHolder) {
+      iHolder->updateLookup(InProcess, *processBlockLookup);
+      iHolder->updateLookup(InRun, *runLookup);
+      iHolder->updateLookup(InLumi, *lumiLookup);
+      iHolder->updateLookup(InEvent, *eventLookup);
+      iHolder->updateLookup(iESIndices);
+      iHolder->resolvePutIndicies(InProcess, processBlockModuleToIndicies);
+      iHolder->resolvePutIndicies(InRun, runModuleToIndicies);
+      iHolder->resolvePutIndicies(InLumi, lumiModuleToIndicies);
+      iHolder->resolvePutIndicies(InEvent, eventModuleToIndicies);
+      iHolder->selectInputProcessBlocks(iRegistry, processBlockHelperBase);
+    });
+  }
 }  // namespace edm

FWCore/Framework/src/Schedule.cc

@@ -1154,30 +1154,9 @@ namespace edm {
                           eventsetup::ESRecordsToProductResolverIndices const& iESIndices,
                           ProcessBlockHelperBase const& processBlockHelperBase,
                           ProcessContext const& processContext) {
-    auto const processBlockLookup = iRegistry.productLookup(InProcess);
-    auto const runLookup = iRegistry.productLookup(InRun);
-    auto const lumiLookup = iRegistry.productLookup(InLumi);
-    auto const eventLookup = iRegistry.productLookup(InEvent);
     auto const& processName = processContext.processConfiguration()->processName();
 
-    auto processBlockModuleToIndicies = processBlockLookup->indiciesForModulesInProcess(processName);
-    auto runModuleToIndicies = runLookup->indiciesForModulesInProcess(processName);
-    auto lumiModuleToIndicies = lumiLookup->indiciesForModulesInProcess(processName);
-    auto eventModuleToIndicies = eventLookup->indiciesForModulesInProcess(processName);
-
-    moduleRegistry_->forAllModuleHolders([&](auto& iHolder) {
-      iHolder->updateLookup(InProcess, *processBlockLookup);
-      iHolder->updateLookup(InRun, *runLookup);
-      iHolder->updateLookup(InLumi, *lumiLookup);
-      iHolder->updateLookup(InEvent, *eventLookup);
-      iHolder->updateLookup(iESIndices);
-      iHolder->resolvePutIndicies(InProcess, processBlockModuleToIndicies);
-      iHolder->resolvePutIndicies(InRun, runModuleToIndicies);
-      iHolder->resolvePutIndicies(InLumi, lumiModuleToIndicies);
-      iHolder->resolvePutIndicies(InEvent, eventModuleToIndicies);
-      iHolder->selectInputProcessBlocks(iRegistry, processBlockHelperBase);
-    });
-
+    moduleRegistry_->finishModulesInitialization(iRegistry, iESIndices, processBlockHelperBase, processName);
     globalSchedule_->beginJob(processContext);
   }
 

Mixing/Base/src/SecondaryEventProvider.cc

@@ -5,9 +5,11 @@
 #include "FWCore/Framework/interface/ExceptionHelpers.h"
 #include "FWCore/Framework/interface/PreallocationConfiguration.h"
 #include "FWCore/Framework/interface/TransitionInfoTypes.h"
+#include "FWCore/Framework/interface/SignallingProductRegistryFiller.h"
+#include "FWCore/Framework/interface/ModuleRegistry.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/StreamID.h"
-#include "FWCore/Framework/interface/SignallingProductRegistryFiller.h"
+#include "FWCore/ServiceRegistry/interface/ProcessContext.h"
 #include "oneapi/tbb/task_arena.h"
 
 #include <mutex>
@@ -55,8 +57,9 @@ namespace edm {
                                                  SignallingProductRegistryFiller& preg,
                                                  std::shared_ptr<ProcessConfiguration> processConfiguration)
       : exceptionToActionTable_(new ExceptionToActionTable),
+        moduleRegistry_(std::make_shared<ModuleRegistry>(nullptr)),
         // no type resolver for modules in SecondaryEventProvider for now
-        workerManager_(std::make_shared<ActivityRegistry>(), *exceptionToActionTable_, nullptr) {
+        workerManager_(moduleRegistry_, std::make_shared<ActivityRegistry>(), *exceptionToActionTable_) {
     std::vector<std::string> shouldBeUsedLabels;
     std::set<std::string> unscheduledLabels;
     const PreallocationConfiguration preallocConfig;
@@ -74,7 +77,11 @@ namespace edm {
                                         eventsetup::ESRecordsToProductResolverIndices const& iIndices,
                                         GlobalContext const& globalContext) {
     ProcessBlockHelper dummyProcessBlockHelper;
-    workerManager_.beginJob(iRegistry, iIndices, dummyProcessBlockHelper, globalContext);
+    moduleRegistry_->finishModulesInitialization(iRegistry,
+                                                 iIndices,
+                                                 dummyProcessBlockHelper,
+                                                 globalContext.processContext()->processConfiguration()->processName());
+    workerManager_.beginJob(globalContext);
   }
 
   //NOTE: When the Stream interfaces are propagated to the modules, this code must be updated

Mixing/Base/src/SecondaryEventProvider.h

@@ -50,6 +50,7 @@ namespace edm {
 
   private:
     std::unique_ptr<ExceptionToActionTable> exceptionToActionTable_;
+    std::shared_ptr<ModuleRegistry> moduleRegistry_;
     WorkerManager workerManager_;
   };
 }  // namespace edm