Move to SignallingProductRegistryFiller

Moved from SignallingProductRegistry. The new class now contains a ProductRegistry rather than inheriting from one. This allowed to addCalled method to be removed and fully implemented in the new class.

Author: Dr15Jones

DQM/SiStripMonitorHardware/src/SiStripSpyEventMatcher.cc

@@ -6,7 +6,7 @@
 #include "FWCore/Sources/interface/VectorInputSource.h"
 #include "FWCore/Sources/interface/VectorInputSourceDescription.h"
 #include "FWCore/Sources/interface/VectorInputSourceFactory.h"
-#include "FWCore/Framework/interface/SignallingProductRegistry.h"
+#include "DataFormats/Provenance/interface/ProductRegistry.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
@@ -54,7 +54,7 @@ namespace sistrip {
         reorderedDigisTag_(config.getParameter<edm::InputTag>("SpyReorderedDigisTag")),
         virginRawDigisTag_(config.getParameter<edm::InputTag>("SpyVirginRawDigisTag")),
         counterDiffMax_(config.getParameter<uint32_t>("CounterDiffMaxAllowed")),
-        productRegistry_(new edm::SignallingProductRegistry),
+        productRegistry_(new edm::ProductRegistry),
         source_(constructSource(config.getParameter<edm::ParameterSet>("SpySource"))),
         // hardware information is not needed for the "overlay"
         processConfiguration_(std::make_unique<edm::ProcessConfiguration>(

DataFormats/Provenance/interface/ProductRegistry.h

@@ -29,12 +29,14 @@
 #include <vector>
 
 namespace edm {
-
+  class SignallingProductRegistryFiller;
   class ProductResolverIndexHelper;
   class TypeID;
 
   class ProductRegistry {
   public:
+    friend class SignallingProductRegistryFiller;
+
     typedef std::map<BranchKey, ProductDescription> ProductList;
 
     ProductRegistry() = default;
@@ -46,7 +48,7 @@ namespace edm {
     // The constructed registry will be frozen by default.
     explicit ProductRegistry(ProductList const& productList, bool toBeFrozen = true);
 
-    virtual ~ProductRegistry() {}
+    ~ProductRegistry() = default;
 
     typedef std::map<BranchKey, ProductDescription const> ConstProductList;
 
@@ -141,14 +143,29 @@ namespace edm {
       AliasToOriginalVector aliasToOriginal_;
     };
 
-  protected:
-    void addProduct_(ProductDescription const& productdesc, bool iFromListener = false);
+  private:
+    //The following three routines are only called by SignallingProductRegistryFiller
+    void addProduct_(ProductDescription const& productdesc);
+
+    ProductDescription const& addLabelAlias_(ProductDescription const& productdesc,
+                                             std::string const& labelAlias,
+                                             std::string const& instanceAlias);
 
-    void addLabelAlias_(ProductDescription const& productdesc,
-                        std::string const& labelAlias,
-                        std::string const& instanceAlias);
     // triggers callbacks for modules watching registration
-    void addFromInput_(edm::ProductRegistry const&);
+    template <typename F>
+    void addFromInput_(edm::ProductRegistry const& iReg, F&& iCallback) {
+      throwIfFrozen();
+      for (auto const& prod : iReg.productList_) {
+        ProductList::iterator iter = productList_.find(prod.first);
+        if (iter == productList_.end()) {
+          productList_.insert(std::make_pair(prod.first, prod.second));
+          iCallback(prod.second);
+        } else {
+          assert(combinable(iter->second, prod.second));
+          iter->second.merge(prod.second);
+        }
+      }
+    }
 
   private:
     void setProductProduced(BranchType branchType) {
@@ -172,7 +189,6 @@ namespace edm {
 
     void checkForDuplicateProcessName(ProductDescription const& desc, std::string const* processName) const;
 
-    virtual void addCalled(ProductDescription const&, bool iFromListener);
     void throwIfNotFrozen() const;
     void throwIfFrozen() const;
 

DataFormats/Provenance/src/ProductRegistry.cc

@@ -63,7 +63,7 @@ namespace edm {
     freezeIt(toBeFrozen);
   }
 
-  void ProductRegistry::addProduct_(ProductDescription const& productDesc, bool fromListener) {
+  void ProductRegistry::addProduct_(ProductDescription const& productDesc) {
     assert(productDesc.produced());
     throwIfFrozen();
     std::pair<ProductList::iterator, bool> ret =
@@ -100,12 +100,11 @@ namespace edm {
             << "descendants of those products.\n";
       }
     }
-    addCalled(productDesc, fromListener);
   }
 
-  void ProductRegistry::addLabelAlias_(ProductDescription const& productDesc,
-                                       std::string const& labelAlias,
-                                       std::string const& instanceAlias) {
+  ProductDescription const& ProductRegistry::addLabelAlias_(ProductDescription const& productDesc,
+                                                            std::string const& labelAlias,
+                                                            std::string const& instanceAlias) {
     assert(productDesc.produced());
     assert(productDesc.branchID().isValid());
     throwIfFrozen();
@@ -114,7 +113,7 @@ namespace edm {
     assert(ret.second);
     transient_.aliasToOriginal_.emplace_back(
         PRODUCT_TYPE, productDesc.unwrappedTypeID(), labelAlias, instanceAlias, productDesc.moduleLabel());
-    addCalled(bd, false);
+    return ret.first->second;
   }
 
   void ProductRegistry::copyProduct(ProductDescription const& productDesc) {
@@ -178,8 +177,6 @@ namespace edm {
     }
   }
 
-  void ProductRegistry::addCalled(ProductDescription const&, bool) {}
-
   std::vector<std::string> ProductRegistry::allBranchNames() const {
     std::vector<std::string> result;
     result.reserve(productList().size());
@@ -212,20 +209,6 @@ namespace edm {
     }
   }
 
-  void ProductRegistry::addFromInput_(edm::ProductRegistry const& other) {
-    throwIfFrozen();
-    for (auto const& prod : other.productList_) {
-      ProductList::iterator iter = productList_.find(prod.first);
-      if (iter == productList_.end()) {
-        productList_.insert(std::make_pair(prod.first, prod.second));
-        addCalled(prod.second, false);
-      } else {
-        assert(combinable(iter->second, prod.second));
-        iter->second.merge(prod.second);
-      }
-    }
-  }
-
   void ProductRegistry::setUnscheduledProducts(std::set<std::string> const& unscheduledLabels) {
     throwIfFrozen();
 

FWCore/Framework/interface/EventProcessor.h

@@ -18,7 +18,7 @@ configured in the user's main() function, and is set running.
 #include "FWCore/Framework/interface/MergeableRunProductProcesses.h"
 #include "FWCore/Framework/interface/SharedResourcesAcquirer.h"
 #include "FWCore/Framework/interface/PrincipalCache.h"
-#include "FWCore/Framework/interface/SignallingProductRegistry.h"
+#include "FWCore/Framework/interface/SignallingProductRegistryFiller.h"
 #include "FWCore/Framework/interface/PreallocationConfiguration.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"

FWCore/Framework/interface/GlobalSchedule.h

@@ -14,7 +14,7 @@
 #include "FWCore/Framework/interface/WorkerManager.h"
 #include "FWCore/Framework/interface/maker/Worker.h"
 #include "FWCore/Framework/interface/WorkerRegistry.h"
-#include "FWCore/Framework/interface/SignallingProductRegistry.h"
+#include "FWCore/Framework/interface/SignallingProductRegistryFiller.h"
 #include "FWCore/MessageLogger/interface/ExceptionMessages.h"
 #include "FWCore/ServiceRegistry/interface/GlobalContext.h"
 #include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
@@ -60,7 +60,7 @@ namespace edm {
                    std::shared_ptr<ModuleRegistry> modReg,
                    std::vector<std::string> const& modulesToUse,
                    ParameterSet& proc_pset,
-                   SignallingProductRegistry& pregistry,
+                   SignallingProductRegistryFiller& pregistry,
                    PreallocationConfiguration const& prealloc,
                    ExceptionToActionTable const& actions,
                    std::shared_ptr<ActivityRegistry> areg,

FWCore/Framework/interface/ModuleChanger.h

@@ -31,11 +31,13 @@
 namespace edm {
   class ParameterSet;
   class Schedule;
-  class SignallingProductRegistry;
+  class SignallingProductRegistryFiller;
 
   class ModuleChanger {
   public:
-    ModuleChanger(Schedule*, SignallingProductRegistry const* iReg, eventsetup::ESRecordsToProductResolverIndices);
+    ModuleChanger(Schedule*,
+                  SignallingProductRegistryFiller const* iReg,
+                  eventsetup::ESRecordsToProductResolverIndices);
     ModuleChanger(const ModuleChanger&) = delete;                   // stop default
     const ModuleChanger& operator=(const ModuleChanger&) = delete;  // stop default
     virtual ~ModuleChanger();
@@ -50,7 +52,7 @@ namespace edm {
   private:
     // ---------- member data --------------------------------
     edm::propagate_const<Schedule*> schedule_;
-    SignallingProductRegistry const* registry_;
+    SignallingProductRegistryFiller const* registry_;
     eventsetup::ESRecordsToProductResolverIndices indices_;
   };
 }  // namespace edm

FWCore/Framework/interface/OutputModuleCore.h

@@ -55,7 +55,7 @@ namespace edm {
   class PreallocationConfiguration;
   class ActivityRegistry;
   class ThinnedAssociationsHelper;
-  class SignallingProductRegistry;
+  class SignallingProductRegistryFiller;
 
   template <typename T>
   class OutputModuleCommunicatorT;
@@ -216,7 +216,7 @@ namespace edm {
       /// Tell the OutputModule that is must end the current file.
       void doCloseFile();
 
-      void registerProductsAndCallbacks(OutputModuleCore const*, SignallingProductRegistry*);
+      void registerProductsAndCallbacks(OutputModuleCore const*, SignallingProductRegistryFiller*);
 
       bool needToRunSelection() const noexcept;
       std::vector<ProductResolverIndexAndSkipBit> productsUsedBySelection() const noexcept;

FWCore/Framework/interface/ProducerBase.h

@@ -22,7 +22,7 @@ EDProducts into an Event.
 namespace edm {
   class ModuleDescription;
   class ProducesCollector;
-  class SignallingProductRegistry;
+  class SignallingProductRegistryFiller;
   class Event;
   class LuminosityBlock;
   class ProcessBlock;
@@ -76,7 +76,7 @@ namespace edm {
     /// used by the fwk to register list of products
     std::function<void(ProductDescription const&)> registrationCallback() const;
 
-    void registerProducts(ProducerBase*, SignallingProductRegistry*, ModuleDescription const&);
+    void registerProducts(ProducerBase*, SignallingProductRegistryFiller*, ModuleDescription const&);
 
     using ProductRegistryHelper::recordProvenanceList;
     using ProductRegistryHelper::typeLabelList;

FWCore/Framework/interface/ProductRegistryHelper.h

@@ -17,7 +17,7 @@
 
 namespace edm {
   class ModuleDescription;
-  class SignallingProductRegistry;
+  class SignallingProductRegistryFiller;
   struct DoNotRecordParents;
 
   template <Transition B>
@@ -104,7 +104,7 @@ namespace edm {
     static void addToRegistry(TypeLabelList::const_iterator const& iBegin,
                               TypeLabelList::const_iterator const& iEnd,
                               ModuleDescription const& iDesc,
-                              SignallingProductRegistry& iReg,
+                              SignallingProductRegistryFiller& iReg,
                               ProductRegistryHelper* iProd,
                               bool iIsListener = false);
 

FWCore/Framework/interface/Schedule.h

@@ -108,7 +108,7 @@ namespace edm {
   class ExceptionCollector;
   class MergeableRunProductMetadata;
   class OutputModuleCommunicator;
-  class SignallingProductRegistry;
+  class SignallingProductRegistryFiller;
   class PreallocationConfiguration;
   class StreamSchedule;
   class GlobalSchedule;
@@ -132,7 +132,7 @@ namespace edm {
 
     Schedule(ParameterSet& proc_pset,
              service::TriggerNamesService const& tns,
-             SignallingProductRegistry& pregistry,
+             SignallingProductRegistryFiller& pregistry,
              ExceptionToActionTable const& actions,
              std::shared_ptr<ActivityRegistry> areg,
              std::shared_ptr<ProcessConfiguration const> processConfiguration,
@@ -141,7 +141,7 @@ namespace edm {
              ModuleTypeResolverMaker const* resolverMaker);
     void finishSetup(ParameterSet& proc_pset,
                      service::TriggerNamesService const& tns,
-                     SignallingProductRegistry& preg,
+                     SignallingProductRegistryFiller& preg,
                      BranchIDListHelper& branchIDListHelper,
                      ProcessBlockHelperBase& processBlockHelper,
                      ThinnedAssociationsHelper& thinnedAssociationsHelper,
@@ -291,7 +291,7 @@ namespace edm {
     /// Returns true if successful.
     bool changeModule(std::string const& iLabel,
                       ParameterSet const& iPSet,
-                      const SignallingProductRegistry& iRegistry,
+                      const SignallingProductRegistryFiller& iRegistry,
                       eventsetup::ESRecordsToProductResolverIndices const&);
 
     /// Deletes module with label iLabel