Moved getting consumes information to ModuleHolder

Author: Dr15Jones

FWCore/Framework/interface/ModuleRegistry.h

@@ -104,6 +104,14 @@ namespace edm {
       }
     }
 
+    template <typename F>
+    void forAllModuleHolders(F iFunc) const {
+      for (auto& labelMod : labelToModule_) {
+        maker::ModuleHolder const* t = labelMod.second.get();
+        iFunc(t);
+      }
+    }
+
     unsigned int maxModuleID() const { return maxModuleID_; }
 
   private:

FWCore/Framework/interface/PathsAndConsumesOfModules.h

@@ -29,9 +29,13 @@
 namespace edm {
 
   class ModuleDescription;
+  class ModuleRegistry;
   class ProductRegistry;
   class Schedule;
 
+  namespace maker {
+    class ModuleHolder;
+  }  // namespace maker
   namespace eventsetup {
     struct ComponentDescription;
     class ESProductResolverProvider;
@@ -96,9 +100,8 @@ namespace edm {
     std::vector<std::vector<ModuleDescription const*>> modulesOnPaths_;
     std::vector<std::vector<ModuleDescription const*>> modulesOnEndPaths_;
 
-    // Gives a translation from the module ID to the index into the
-    // following data member
-    std::vector<std::pair<unsigned int, unsigned int>> moduleIDToIndex_;
+    // Gives a translation from the module ID to the holder
+    std::vector<edm::maker::ModuleHolder const*> moduleIDToHolder_;
 
     std::array<std::vector<std::vector<ModuleDescription const*>>, NumBranchTypes> modulesWhoseProductsAreConsumedBy_;
 
@@ -114,6 +117,7 @@ namespace edm {
     std::vector<std::vector<eventsetup::ComponentDescription const*>> esModulesWhoseProductsAreConsumedByESModule_;
 
     Schedule const* schedule_ = nullptr;
+    ModuleRegistry const* moduleRegistry_ = nullptr;
     ProducedByESModule producedByESModule_;
     std::shared_ptr<ProductRegistry const> preg_;
     bool eventSetupInfoInitialized_ = false;

FWCore/Framework/interface/Schedule.h

@@ -289,6 +289,8 @@ namespace edm {
     /// returns the collection of pointers to workers
     AllWorkers const& allWorkers() const;
 
+    ModuleRegistry const& moduleRegistry() const { return *moduleRegistry_; }
+
     /// Convert "@currentProcess" in InputTag process names to the actual current process name.
     void convertCurrentProcessAlias(std::string const& processName);
 
@@ -301,7 +303,9 @@ namespace edm {
       return get_underlying_safe(resultsInserter_);
     }
     std::shared_ptr<TriggerResultInserter>& resultsInserter() { return get_underlying_safe(resultsInserter_); }
-    std::shared_ptr<ModuleRegistry const> moduleRegistry() const { return get_underlying_safe(moduleRegistry_); }
+    std::shared_ptr<ModuleRegistry const> moduleRegistrySharedPtr() const {
+      return get_underlying_safe(moduleRegistry_);
+    }
     std::shared_ptr<ModuleRegistry>& moduleRegistry() { return get_underlying_safe(moduleRegistry_); }
 
     edm::propagate_const<std::shared_ptr<ModuleRegistry>> moduleRegistry_;

FWCore/Framework/interface/StreamSchedule.h

@@ -253,6 +253,7 @@ namespace edm {
 
     std::vector<Worker*> tryToPlaceConditionalModules(
         Worker*,
+        ModuleRegistry& iRegistry,
         std::unordered_set<std::string>& conditionalModules,
         std::unordered_multimap<std::string, edm::ProductDescription const*> const& conditionalModuleBranches,
         std::unordered_multimap<std::string, AliasInfo> const& aliasMap,
@@ -261,6 +262,7 @@ namespace edm {
         PreallocationConfiguration const* prealloc,
         std::shared_ptr<ProcessConfiguration const> processConfiguration);
     PathWorkers fillWorkers(ParameterSet& proc_pset,
+                            ModuleRegistry& moduleRegistry,
                             SignallingProductRegistryFiller& preg,
                             PreallocationConfiguration const* prealloc,
                             std::shared_ptr<ProcessConfiguration const> processConfiguration,
@@ -270,6 +272,7 @@ namespace edm {
                             ConditionalTaskHelper const& conditionalTaskHelper,
                             std::unordered_set<std::string>& allConditionalModules);
     void fillTrigPath(ParameterSet& proc_pset,
+                      ModuleRegistry& moduleRegistry,
                       SignallingProductRegistryFiller& preg,
                       PreallocationConfiguration const* prealloc,
                       std::shared_ptr<ProcessConfiguration const> processConfiguration,
@@ -280,6 +283,7 @@ namespace edm {
                       ConditionalTaskHelper const& conditionalTaskHelper,
                       std::unordered_set<std::string>& allConditionalModules);
     void fillEndPath(ParameterSet& proc_pset,
+                     ModuleRegistry& moduleRegistry,
                      SignallingProductRegistryFiller& preg,
                      PreallocationConfiguration const* prealloc,
                      std::shared_ptr<ProcessConfiguration const> processConfiguration,

FWCore/Framework/interface/maker/ModuleHolder.h

@@ -50,6 +50,9 @@ namespace edm {
       virtual std::unique_ptr<Worker> makeWorker(ExceptionToActionTable const* actions) const = 0;
 
       virtual ModuleDescription const& moduleDescription() const = 0;
+      virtual std::vector<ModuleConsumesInfo> moduleConsumesInfos() const = 0;
+      virtual std::vector<ModuleConsumesMinimalESInfo> moduleConsumesMinimalESInfos() const = 0;
+
       virtual void finishModuleInitialization(ModuleDescription const& iDesc,
                                               PreallocationConfiguration const& iPrealloc,
                                               SignallingProductRegistryFiller* iReg) = 0;
@@ -112,6 +115,8 @@ namespace edm {
         }
       };
       ModuleDescription const& moduleDescription() const final { return m_mod->moduleDescription(); }
+      std::vector<ModuleConsumesInfo> moduleConsumesInfos() const final;
+      std::vector<ModuleConsumesMinimalESInfo> moduleConsumesMinimalESInfos() const final;
 
       void finishModuleInitialization(ModuleDescription const& iDesc,
                                       PreallocationConfiguration const& iPrealloc,

FWCore/Framework/interface/maker/Worker.h

@@ -206,9 +206,6 @@ namespace edm {
 
     void setEarlyDeleteHelper(EarlyDeleteHelper* iHelper);
 
-    virtual std::vector<ModuleConsumesInfo> moduleConsumesInfos() const = 0;
-    virtual std::vector<ModuleConsumesMinimalESInfo> moduleConsumesMinimalESInfos() const = 0;
-
     virtual Types moduleType() const = 0;
     virtual ConcurrencyTypes moduleConcurrencyType() const = 0;
 

FWCore/Framework/interface/maker/WorkerT.h

@@ -110,11 +110,6 @@ namespace edm {
     bool implDoEnd(LumiTransitionInfo const&, ModuleCallingContext const*) override;
     TaskQueueAdaptor serializeRunModule() override;
 
-    std::vector<ModuleConsumesInfo> moduleConsumesInfos() const override;
-    std::vector<ModuleConsumesMinimalESInfo> moduleConsumesMinimalESInfos() const final {
-      return module_->moduleConsumesMinimalESInfos();
-    }
-
     void itemsToGet(BranchType branchType, std::vector<ProductResolverIndexAndSkipBit>& indexes) const override {
       module_->itemsToGet(branchType, indexes);
     }

FWCore/Framework/src/ModuleHolderT.cc

@@ -235,6 +235,15 @@ namespace edm::maker {
     resolvePutIndiciesImpl(m_mod.get(), iBranchType, iIndicies, moduleDescription().moduleLabel());
   }
 
+  template <typename T>
+  std::vector<ModuleConsumesInfo> ModuleHolderT<T>::moduleConsumesInfos() const {
+    return m_mod->moduleConsumesInfos();
+  }
+  template <typename T>
+  std::vector<ModuleConsumesMinimalESInfo> ModuleHolderT<T>::moduleConsumesMinimalESInfos() const {
+    return m_mod->moduleConsumesMinimalESInfos();
+  }
+
   //Explicitly instantiate our needed templates to avoid having the compiler
   // instantiate them in all of our libraries
   template class ModuleHolderT<one::EDProducerBase>;