Must explicitly ask for the ProductRegistry in SignallingProductRegistry

Dr15Jones · Dr15Jones · commit 692153cfe658 · 2025-03-07T09:03:49.000-06:00
diff --git a/DataFormats/Provenance/interface/ProductRegistry.h b/DataFormats/Provenance/interface/ProductRegistry.h
@@ -40,6 +40,7 @@ namespace edm {
     ProductRegistry() = default;
     ProductRegistry(const ProductRegistry&) = default;
     ProductRegistry(ProductRegistry&&) = default;
+    ProductRegistry& operator=(ProductRegistry&&) = default;
     // A constructor from the persistent data members from another product registry.
     // saves time by not copying the transient components.
     // The constructed registry will be frozen by default.
@@ -64,8 +65,6 @@ namespace edm {
                       ProductDescription::MatchMode branchesMustMatch = ProductDescription::Permissive);
 
     void updateFromInput(ProductList const& other);
-    // triggers callbacks for modules watching registration
-    void addFromInput(edm::ProductRegistry const&);
 
     void updateFromInput(std::vector<ProductDescription> const& other);
 
@@ -90,21 +89,6 @@ namespace edm {
     // colon-initialization list.
     std::vector<ProductDescription const*> allProductDescriptions() const;
 
-    //NOTE: this is not const since we only want items that have non-const access to this class to be
-    // able to call this internal iteration
-    // Called only for branches that are present (part of avoiding creating type information for dropped branches)
-    template <typename T>
-    void callForEachBranch(T const& iFunc) {
-      //NOTE: If implementation changes from a map, need to check that iterators are still valid
-      // after an insert with the new container, else need to copy the container and iterate over the copy
-      for (ProductRegistry::ProductList::const_iterator itEntry = productList_.begin(), itEntryEnd = productList_.end();
-           itEntry != itEntryEnd;
-           ++itEntry) {
-        if (itEntry->second.present()) {
-          iFunc(itEntry->second);
-        }
-      }
-    }
     ProductList::size_type size() const { return productList_.size(); }
 
     void print(std::ostream& os) const;
@@ -163,6 +147,8 @@ namespace edm {
     void addLabelAlias_(ProductDescription const& productdesc,
                         std::string const& labelAlias,
                         std::string const& instanceAlias);
+    // triggers callbacks for modules watching registration
+    void addFromInput_(edm::ProductRegistry const&);
 
   private:
     void setProductProduced(BranchType branchType) {
diff --git a/DataFormats/Provenance/src/ProductRegistry.cc b/DataFormats/Provenance/src/ProductRegistry.cc
@@ -212,7 +212,7 @@ namespace edm {
     }
   }
 
-  void ProductRegistry::addFromInput(edm::ProductRegistry const& other) {
+  void ProductRegistry::addFromInput_(edm::ProductRegistry const& other) {
     throwIfFrozen();
     for (auto const& prod : other.productList_) {
       ProductList::iterator iter = productList_.find(prod.first);
diff --git a/FWCore/Framework/interface/SignallingProductRegistry.h b/FWCore/Framework/interface/SignallingProductRegistry.h
@@ -30,7 +30,7 @@
 
 // forward declarations
 namespace edm {
-  class SignallingProductRegistry : public ProductRegistry {
+  class SignallingProductRegistry : private ProductRegistry {
   public:
     SignallingProductRegistry() : ProductRegistry(), productAddedSignal_(), typeAddedStack_() {}
 
@@ -40,8 +40,9 @@ namespace edm {
 
     struct Copy {};
 
-    SignallingProductRegistry(ProductRegistry const& preg, Copy): ProductRegistry(preg), productAddedSignal_(), typeAddedStack_() {};
-    
+    SignallingProductRegistry(ProductRegistry const& preg, Copy)
+        : ProductRegistry(preg), productAddedSignal_(), typeAddedStack_() {};
+
     void addProduct(ProductDescription const& productdesc, bool iFromListener = false) {
       addProduct_(productdesc, iFromListener);
     }
@@ -51,6 +52,27 @@ namespace edm {
                        std::string const& instanceAlias) {
       addLabelAlias_(productdesc, labelAlias, instanceAlias);
     }
+    void addFromInput(edm::ProductRegistry const& iReg) { addFromInput_(iReg); }
+
+    //NOTE: this is not const since we only want items that have non-const access to this class to be
+    // able to call this internal iteration
+    // Called only for branches that are present (part of avoiding creating type information for dropped branches)
+    template <typename T>
+    void callForEachBranch(T const& iFunc) {
+      //NOTE: If implementation changes from a map, need to check that iterators are still valid
+      // after an insert with the new container, else need to copy the container and iterate over the copy
+      for (ProductRegistry::ProductList::const_iterator itEntry = productList().begin(), itEntryEnd = productList().end();
+           itEntry != itEntryEnd;
+           ++itEntry) {
+        if (itEntry->second.present()) {
+          iFunc(itEntry->second);
+        }
+      }
+    }
+    void setUnscheduledProducts(std::set<std::string> const& unscheduledLabels) {
+      ProductRegistry::setUnscheduledProducts(unscheduledLabels);
+    }
+    ProductList& productListUpdator() { return ProductRegistry::productListUpdator(); }
 
     SignallingProductRegistry(SignallingProductRegistry const&) = delete;             // Disallow copying and moving
     SignallingProductRegistry& operator=(SignallingProductRegistry const&) = delete;  // Disallow copying and moving
@@ -65,7 +87,16 @@ namespace edm {
       serviceregistry::connect_but_block_self(productAddedSignal_, std::bind(iMethod, iObj, _1));
     }
 
-    ProductRegistry const& registry() { return *this; }
+    ProductRegistry moveTo() { return std::move(*this); }
+    ProductRegistry const& registry() const { return *this; }
+
+    void setFrozen(bool initializeLookupInfo = true) { ProductRegistry::setFrozen(initializeLookupInfo); }
+
+    void setFrozen(std::set<TypeID> const& productTypesConsumed,
+                   std::set<TypeID> const& elementTypesConsumed,
+                   std::string const& processName) {
+      ProductRegistry::setFrozen(productTypesConsumed, elementTypesConsumed, processName);
+    }
 
   private:
     void addCalled(ProductDescription const&, bool) override;
diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
@@ -528,7 +528,7 @@ namespace edm {
       // set the data members
       act_table_ = std::move(items.act_table_);
       actReg_ = items.actReg_;
-      preg_ = items.preg();
+      preg_ = std::make_shared<ProductRegistry>(items.preg()->moveTo());
       mergeableRunProductProcesses_.setProcessesWithMergeableRunProducts(*preg_);
       branchIDListHelper_ = items.branchIDListHelper();
       thinnedAssociationsHelper_ = items.thinnedAssociationsHelper();
diff --git a/FWCore/Framework/src/Schedule.cc b/FWCore/Framework/src/Schedule.cc
@@ -153,7 +153,9 @@ namespace edm {
 
     typedef std::vector<std::string> vstring;
 
-    void processSwitchProducers(ParameterSet const& proc_pset, std::string const& processName, ProductRegistry& preg) {
+    void processSwitchProducers(ParameterSet const& proc_pset,
+                                std::string const& processName,
+                                SignallingProductRegistry& preg) {
       // Update Switch ProductDescriptions for the chosen case
       struct BranchesCases {
         BranchesCases(std::vector<std::string> cases) : caseLabels{std::move(cases)} {}
@@ -173,7 +175,7 @@ namespace edm {
           }
 
           bool found = false;
-          for (auto const& productIter : preg.productList()) {
+          for (auto const& productIter : preg.registry().productList()) {
             BranchKey const& branchKey = productIter.first;
             // The alias-for product must be in the same process as
             // the SwitchProducer (earlier processes or SubProcesses
@@ -217,7 +219,7 @@ namespace edm {
 
       auto addProductsToException = [&preg, &processName](auto const& caseLabels, edm::Exception& ex) {
         std::map<std::string, std::vector<BranchKey>> caseBranches;
-        for (auto const& item : preg.productList()) {
+        for (auto const& item : preg.registry().productList()) {
           if (item.first.processName() != processName)
             continue;
 
@@ -644,18 +646,18 @@ namespace edm {
     // already relied on the WorkerManager being full.
     assert(all_workers_count == allWorkers().size());
 
-    branchIDListHelper.updateFromRegistry(preg);
+    branchIDListHelper.updateFromRegistry(preg.registry());
 
     for (auto const& worker : streamSchedules_[0]->allWorkersLumisAndEvents()) {
-      worker->registerThinnedAssociations(preg, thinnedAssociationsHelper);
+      worker->registerThinnedAssociations(preg.registry(), thinnedAssociationsHelper);
     }
 
-    processBlockHelper.updateForNewProcess(preg, processConfiguration->processName());
+    processBlockHelper.updateForNewProcess(preg.registry(), processConfiguration->processName());
 
     // The output modules consume products in kept branches.
     // So we must set this up before freezing.
     for (auto& c : all_output_communicators_) {
-      c->selectProducts(preg, thinnedAssociationsHelper, processBlockHelper);
+      c->selectProducts(preg.registry(), thinnedAssociationsHelper, processBlockHelper);
     }
 
     for (auto& product : preg.productListUpdator()) {
@@ -688,7 +690,7 @@ namespace edm {
     }
 
     for (auto& c : all_output_communicators_) {
-      c->setEventSelectionInfo(outputModulePathPositions, preg.anyProductProduced());
+      c->setEventSelectionInfo(outputModulePathPositions, preg.registry().anyProductProduced());
     }
 
     if (wantSummary_) {
@@ -1241,10 +1243,10 @@ namespace edm {
 
     {
       //Need to updateLookup in order to make getByToken work
-      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 processBlockLookup = iRegistry.registry().productLookup(InProcess);
+      auto const runLookup = iRegistry.registry().productLookup(InRun);
+      auto const lumiLookup = iRegistry.registry().productLookup(InLumi);
+      auto const eventLookup = iRegistry.registry().productLookup(InEvent);
       found->updateLookup(InProcess, *runLookup);
       found->updateLookup(InRun, *runLookup);
       found->updateLookup(InLumi, *lumiLookup);
diff --git a/FWCore/Framework/src/ScheduleItems.cc b/FWCore/Framework/src/ScheduleItems.cc
@@ -82,7 +82,7 @@ namespace edm {
         prod.setDropped(true);
       }
     }
-    subProcessBlockHelper.updateFromParentProcess(parentProcessBlockHelper, *preg_);
+    subProcessBlockHelper.updateFromParentProcess(parentProcessBlockHelper, preg_->registry());
   }
 
   ServiceToken ScheduleItems::initServices(std::vector<ParameterSet>& pServiceSets,
diff --git a/FWCore/Framework/src/StreamSchedule.cc b/FWCore/Framework/src/StreamSchedule.cc
@@ -291,7 +291,7 @@ namespace edm {
       processSwitchEDAliases(proc_pset, preg, *processConfiguration, allConditionalMods);
 
       //find branches created by the conditional modules
-      for (auto const& prod : preg.productList()) {
+      for (auto const& prod : preg.registry().productList()) {
         if (allConditionalMods.find(prod.first.moduleLabel()) != allConditionalMods.end()) {
           conditionalModsBranches_.emplace(prod.first.moduleLabel(), &prod.second);
         }
diff --git a/FWCore/Framework/src/SubProcess.cc b/FWCore/Framework/src/SubProcess.cc
@@ -174,7 +174,7 @@ namespace edm {
 
     // set the items
     act_table_ = std::move(items.act_table_);
-    preg_ = items.preg();
+    preg_ = std::make_shared<ProductRegistry>(items.preg()->moveTo());
 
     subProcessParentageHelper_ = items.subProcessParentageHelper();
     subProcessParentageHelper_->update(parentSubProcessParentageHelper, *parentProductRegistry);
diff --git a/FWCore/Framework/src/processEDAliases.cc b/FWCore/Framework/src/processEDAliases.cc
@@ -16,7 +16,7 @@ namespace edm {
                              std::string const& processName,
                              std::string const& alias,
                              std::string const& instanceAlias,
-                             SignallingProductRegistry const& preg,
+                             ProductRegistry const& preg,
                              std::multimap<BranchKey, BranchKey>& aliasMap,
                              std::map<BranchKey, BranchKey>& aliasKeys) {
       std::string const star("*");
@@ -109,7 +109,7 @@ namespace edm {
 
       // Auxiliary search structure to support wildcard for friendlyClassName
       std::multimap<std::string, BranchKey> moduleLabelToBranches;
-      for (auto const& prod : preg.productList()) {
+      for (auto const& prod : preg.registry().productList()) {
         if (processName == prod.second.processName()) {
           moduleLabelToBranches.emplace(prod.first.moduleLabel(), prod.first);
         }
@@ -150,7 +150,7 @@ namespace edm {
                                     processName,
                                     alias,
                                     instanceAlias,
-                                    preg,
+                                    preg.registry(),
                                     aliasMap,
                                     aliasKeys);
               }
@@ -166,8 +166,9 @@ namespace edm {
             } else if (productInstanceName == star) {
               bool match = false;
               BranchKey lowerBound(friendlyClassName, moduleLabel, empty, empty);
-              for (ProductRegistry::ProductList::const_iterator it = preg.productList().lower_bound(lowerBound);
-                   it != preg.productList().end() && it->first.friendlyClassName() == friendlyClassName &&
+              for (ProductRegistry::ProductList::const_iterator it =
+                       preg.registry().productList().lower_bound(lowerBound);
+                   it != preg.registry().productList().end() && it->first.friendlyClassName() == friendlyClassName &&
                    it->first.moduleLabel() == moduleLabel;
                    ++it) {
                 if (it->first.processName() != processName) {
@@ -181,14 +182,14 @@ namespace edm {
                                     processName,
                                     alias,
                                     instanceAlias,
-                                    preg,
+                                    preg.registry(),
                                     aliasMap,
                                     aliasKeys);
               }
               if (!match) {
                 // No product was found matching the alias.
                 // We throw an exception only if a module with the specified module label was created in this process.
-                for (auto const& product : preg.productList()) {
+                for (auto const& product : preg.registry().productList()) {
                   if (moduleLabel == product.first.moduleLabel() && processName == product.first.processName()) {
                     throw Exception(errors::Configuration, "EDAlias parameter set mismatch\n")
                         << "There are no products of type '" << friendlyClassName << "'\n"
@@ -203,7 +204,7 @@ namespace edm {
                                   processName,
                                   alias,
                                   instanceAlias,
-                                  preg,
+                                  preg.registry(),
                                   aliasMap,
                                   aliasKeys);
             }
@@ -214,8 +215,8 @@ namespace edm {
       // Now add the new alias entries to the product registry.
       for (auto const& aliasEntry : aliasMap) {
         // Then check that the alias-for product exists
-        ProductRegistry::ProductList::const_iterator it = preg.productList().find(aliasEntry.first);
-        assert(it != preg.productList().end());
+        ProductRegistry::ProductList::const_iterator it = preg.registry().productList().find(aliasEntry.first);
+        assert(it != preg.registry().productList().end());
         preg.addLabelAlias(it->second, aliasEntry.second.moduleLabel(), aliasEntry.second.productInstanceName());
       }
     }
diff --git a/FWCore/Framework/test/Event_t.cpp b/FWCore/Framework/test/Event_t.cpp
@@ -376,7 +376,7 @@ testEvent::testEvent()
 
   // Freeze the product registry before we make the Event.
   availableProducts_->setFrozen();
-  branchIDListHelper_->updateFromRegistry(*availableProducts_);
+  branchIDListHelper_->updateFromRegistry(availableProducts_->registry());
 }
 
 testEvent::~testEvent() {}
@@ -440,7 +440,7 @@ void testEvent::setUp() {
   // and that is used to create the product holder in the principal used to
   // look up the object.
 
-  std::shared_ptr<ProductRegistry const> preg(availableProducts_);
+  std::shared_ptr<ProductRegistry const> preg(std::make_shared<ProductRegistry>(availableProducts_->registry()));
   std::string uuid = createGlobalIdentifier();
   Timestamp time = make_timestamp();
   EventID id = make_id();
diff --git a/FWCore/Framework/test/edproducer_productregistry_callback.cc b/FWCore/Framework/test/edproducer_productregistry_callback.cc
@@ -176,7 +176,7 @@ void testEDProducerProductRegistryCallback::testCircularRef() {
   //    1 from 'l2' in response to 't2'
   //       1 from 'l1' in response to 'l2'
   //std::cout <<"# products "<<preg.size()<<std::endl;
-  CPPUNIT_ASSERT(10 == preg.size());
+  CPPUNIT_ASSERT(10 == preg.registry().size());
 }
 
 void testEDProducerProductRegistryCallback::testCircularRef2() {
@@ -246,7 +246,7 @@ void testEDProducerProductRegistryCallback::testCircularRef2() {
   //    1 from 'l2' in response to 't2'
   //       1 from 'l1' in response to 'l2'
   //std::cout <<"# products "<<preg.size()<<std::endl;
-  CPPUNIT_ASSERT(10 == preg.size());
+  CPPUNIT_ASSERT(10 == preg.registry().size());
 }
 
 void testEDProducerProductRegistryCallback::testTwoListeners() {
@@ -315,5 +315,5 @@ void testEDProducerProductRegistryCallback::testTwoListeners() {
   //       1 from 'l2' in response to 'l1'
   //    1 from 'l2' in response to 't2'
   //std::cout <<"# products "<<preg.size()<<std::endl;
-  CPPUNIT_ASSERT(8 == preg.size());
+  CPPUNIT_ASSERT(8 == preg.registry().size());
 }
diff --git a/FWCore/Framework/test/event_getrefbeforeput_t.cppunit.cc b/FWCore/Framework/test/event_getrefbeforeput_t.cppunit.cc
@@ -160,14 +160,14 @@ void testEventGetRefBeforePut::getRefTest() {
   preg->addProduct(product);
   preg->setFrozen();
   auto branchIDListHelper = std::make_shared<edm::BranchIDListHelper>();
-  branchIDListHelper->updateFromRegistry(*preg);
+  branchIDListHelper->updateFromRegistry(preg->registry());
   auto thinnedAssociationsHelper = std::make_shared<edm::ThinnedAssociationsHelper>();
   edm::EventID col(1L, 1L, 1L);
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp fakeTime;
   auto pcPtr = edmtest::makeSharedDummyProcessConfiguration(processName);
   edm::ProcessConfiguration& pc = *pcPtr;
-  std::shared_ptr<edm::ProductRegistry const> pregc(preg.release());
+  std::shared_ptr<edm::ProductRegistry const> pregc(std::make_shared<edm::ProductRegistry>(preg->moveTo()));
   auto rp =
       std::make_shared<edm::RunPrincipal>(pregc, edm::productResolversFactory::makePrimary, pc, &historyAppender_, 0);
   rp->setAux(edm::RunAuxiliary(col.run(), fakeTime, fakeTime));
diff --git a/FWCore/Framework/test/eventprincipal_t.cppunit.cc b/FWCore/Framework/test/eventprincipal_t.cppunit.cc
diff --git a/FWCore/Framework/test/generichandle_t.cppunit.cc b/FWCore/Framework/test/generichandle_t.cppunit.cc
diff --git a/FWCore/Framework/test/productregistry.cppunit.cc b/FWCore/Framework/test/productregistry.cppunit.cc
diff --git a/FWCore/Framework/test/test_catch2notTP_MergeableRunProductMetadata.cc b/FWCore/Framework/test/test_catch2notTP_MergeableRunProductMetadata.cc
diff --git a/FWCore/Sources/src/PuttableSourceBase.cc b/FWCore/Sources/src/PuttableSourceBase.cc

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ namespace edm {`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`
`215`		`- void ProductRegistry::addFromInput(edm::ProductRegistry const& other) {`
	`215`	`+ void ProductRegistry::addFromInput_(edm::ProductRegistry const& other) {`
`216`	`216`	`throwIfFrozen();`
`217`	`217`	`for (auto const& prod : other.productList_) {`
`218`	`218`	`ProductList::iterator iter = productList_.find(prod.first);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ namespace edm {`
`82`	`82`	`prod.setDropped(true);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`		`- subProcessBlockHelper.updateFromParentProcess(parentProcessBlockHelper, *preg_);`
	`85`	`+ subProcessBlockHelper.updateFromParentProcess(parentProcessBlockHelper, preg_->registry());`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`ServiceToken ScheduleItems::initServices(std::vector<ParameterSet>& pServiceSets,`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ namespace edm {`
`291`	`291`	`processSwitchEDAliases(proc_pset, preg, *processConfiguration, allConditionalMods);`
`292`	`292`
`293`	`293`	`//find branches created by the conditional modules`
`294`		`- for (auto const& prod : preg.productList()) {`
	`294`	`+ for (auto const& prod : preg.registry().productList()) {`
`295`	`295`	`if (allConditionalMods.find(prod.first.moduleLabel()) != allConditionalMods.end()) {`
`296`	`296`	`conditionalModsBranches_.emplace(prod.first.moduleLabel(), &prod.second);`
`297`	`297`	`}`