Fix meta-data and Service issues in TestSourceProcessor

Testing using PoolSource uncovered these issues.

Author: Dr15Jones

FWCore/TestProcessor/interface/EventFromSource.h

@@ -25,6 +25,8 @@
 #include "FWCore/TestProcessor/interface/TestHandle.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/Utilities/interface/TypeID.h"
+#include "FWCore/ServiceRegistry/interface/ServiceToken.h"
+#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
 
 // forward declarations
 
@@ -35,13 +37,16 @@ namespace edm {
 
     class EventFromSource {
     public:
-      EventFromSource(EventPrincipal const& iPrincipal) : principal_(&iPrincipal) {}
+      EventFromSource(EventPrincipal const& iPrincipal, edm::ServiceToken iToken)
+          : principal_(&iPrincipal), token_(iToken) {}
 
       // ---------- const member functions ---------------------
       template <typename T>
       TestHandle<T> get(std::string const& iModule,
                         std::string const& iInstanceLabel,
                         std::string const& iProcess) const {
+        ServiceRegistry::Operate operate(token_);
+
         auto h = principal_->getByLabel(
             edm::PRODUCT_TYPE, edm::TypeID(typeid(T)), iModule, iInstanceLabel, iProcess, nullptr, nullptr, nullptr);
         if (h.failedToGet()) {
@@ -61,6 +66,7 @@ namespace edm {
     private:
       // ---------- member data --------------------------------
       EventPrincipal const* principal_;
+      edm::ServiceToken token_;
     };
   }  // namespace test
 }  // namespace edm

FWCore/TestProcessor/interface/LuminosityBlockFromSource.h

@@ -25,6 +25,8 @@
 #include "FWCore/TestProcessor/interface/TestHandle.h"
 #include "FWCore/Framework/interface/LuminosityBlockPrincipal.h"
 #include "FWCore/Utilities/interface/TypeID.h"
+#include "FWCore/ServiceRegistry/interface/ServiceToken.h"
+#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
 
 // forward declarations
 
@@ -34,13 +36,16 @@ namespace edm {
 
     class LuminosityBlockFromSource {
     public:
-      LuminosityBlockFromSource(std::shared_ptr<LuminosityBlockPrincipal const> iPrincipal) : principal_(iPrincipal) {}
+      LuminosityBlockFromSource(std::shared_ptr<LuminosityBlockPrincipal const> iPrincipal, edm::ServiceToken iToken)
+          : principal_(iPrincipal), token_(iToken) {}
 
       // ---------- const member functions ---------------------
       template <typename T>
       TestHandle<T> get(std::string const& iModule,
                         std::string const& iInstanceLabel,
                         std::string const& iProcess) const {
+        ServiceRegistry::Operate operate(token_);
+
         auto h = principal_->getByLabel(
             edm::PRODUCT_TYPE, edm::TypeID(typeid(T)), iModule, iInstanceLabel, iProcess, nullptr, nullptr, nullptr);
         if (h.failedToGet()) {
@@ -63,6 +68,7 @@ namespace edm {
     private:
       // ---------- member data --------------------------------
       std::shared_ptr<LuminosityBlockPrincipal const> principal_;
+      edm::ServiceToken token_;
     };
   }  // namespace test
 }  // namespace edm

FWCore/TestProcessor/interface/RunFromSource.h

@@ -25,6 +25,8 @@
 #include "FWCore/TestProcessor/interface/TestHandle.h"
 #include "FWCore/Framework/interface/RunPrincipal.h"
 #include "FWCore/Utilities/interface/TypeID.h"
+#include "FWCore/ServiceRegistry/interface/ServiceToken.h"
+#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
 
 // forward declarations
 
@@ -34,13 +36,16 @@ namespace edm {
 
     class RunFromSource {
     public:
-      RunFromSource(std::shared_ptr<RunPrincipal const> iPrincipal) : principal_(iPrincipal) {}
+      RunFromSource(std::shared_ptr<RunPrincipal const> iPrincipal, edm::ServiceToken iToken)
+          : principal_(iPrincipal), token_(iToken) {}
 
       // ---------- const member functions ---------------------
       template <typename T>
       TestHandle<T> get(std::string const& iModule,
                         std::string const& iInstanceLabel,
                         std::string const& iProcess) const {
+        ServiceRegistry::Operate operate(token_);
+
         auto h = principal_->getByLabel(
             edm::PRODUCT_TYPE, edm::TypeID(typeid(T)), iModule, iInstanceLabel, iProcess, nullptr, nullptr, nullptr);
         if (h.failedToGet()) {
@@ -58,6 +63,7 @@ namespace edm {
     private:
       // ---------- member data --------------------------------
       std::shared_ptr<RunPrincipal const> principal_;
+      edm::ServiceToken token_;
     };
   }  // namespace test
 }  // namespace edm

FWCore/TestProcessor/interface/TestSourceProcessor.h

@@ -34,6 +34,8 @@
 #include "FWCore/Framework/interface/PrincipalCache.h"
 #include "FWCore/Framework/interface/SignallingProductRegistry.h"
 #include "FWCore/Framework/interface/PreallocationConfiguration.h"
+#include "FWCore/Framework/interface/MergeableRunProductProcesses.h"
+
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/ServiceRegistry/interface/ProcessContext.h"
 #include "FWCore/ServiceRegistry/interface/ServiceLegacy.h"
@@ -49,6 +51,7 @@ namespace edm::test {
   class TestSourceProcessor {
   public:
     TestSourceProcessor(std::string const& iConfig, ServiceToken iToken = ServiceToken());
+    ~TestSourceProcessor();
 
     InputSource::ItemTypeInfo findNextTransition();
 
@@ -62,7 +65,6 @@ namespace edm::test {
     edm::test::EventFromSource readEvent();
 
   private:
-    std::unique_ptr<edm::InputSource> source_;
     edm::InputSource::ItemTypeInfo lastTransition_;
 
     oneapi::tbb::global_control globalControl_;
@@ -77,13 +79,16 @@ namespace edm::test {
 
     std::shared_ptr<ProcessConfiguration const> processConfiguration_;
     ProcessContext processContext_;
+    MergeableRunProductProcesses mergeableRunProductProcesses_;
 
     ProcessHistoryRegistry processHistoryRegistry_;
     std::unique_ptr<HistoryAppender> historyAppender_;
 
     PrincipalCache principalCache_;
     PreallocationConfiguration preallocations_;
 
+    std::unique_ptr<edm::InputSource> source_;
+
     std::shared_ptr<RunPrincipal> runPrincipal_;
     std::shared_ptr<LuminosityBlockPrincipal> lumiPrincipal_;
 

FWCore/TestProcessor/src/TestSourceProcessor.cc

@@ -161,11 +161,14 @@ namespace edm::test {
     actReg_ = items.actReg_;
     branchIDListHelper_ = items.branchIDListHelper();
     thinnedAssociationsHelper_ = items.thinnedAssociationsHelper();
+    processConfiguration_ = items.processConfiguration();
+
     processContext_.setProcessConfiguration(processConfiguration_.get());
     preg_ = items.preg();
     principalCache_.setNumberOfConcurrentPrincipals(preallocations_);
 
     preg_->setFrozen();
+    mergeableRunProductProcesses_.setProcessesWithMergeableRunProducts(*preg_);
 
     for (unsigned int index = 0; index < preallocations_.numberOfStreams(); ++index) {
       // Reusable event principal
@@ -174,7 +177,8 @@ namespace edm::test {
       principalCache_.insert(std::move(ep));
     }
     for (unsigned int index = 0; index < preallocations_.numberOfRuns(); ++index) {
-      auto rp = std::make_unique<RunPrincipal>(preg_, *processConfiguration_, historyAppender_.get(), index);
+      auto rp = std::make_unique<RunPrincipal>(
+          preg_, *processConfiguration_, historyAppender_.get(), index, true, &mergeableRunProductProcesses_);
       principalCache_.insert(std::move(rp));
     }
     for (unsigned int index = 0; index < preallocations_.numberOfLuminosityBlocks(); ++index) {
@@ -190,12 +194,28 @@ namespace edm::test {
     source_->doBeginJob();
   }
 
+  TestSourceProcessor::~TestSourceProcessor() {
+    //make the services available
+    ServiceRegistry::Operate operate(serviceToken_);
+    try {
+      source_.reset();
+    } catch (std::exception const& iExcept) {
+      std::cerr << " caught exception while destroying TestSourceProcessor\n" << iExcept.what();
+    }
+  }
+
   edm::InputSource::ItemTypeInfo TestSourceProcessor::findNextTransition() {
+    //make the services available
+    ServiceRegistry::Operate operate(serviceToken_);
+
     lastTransition_ = source_->nextItemType();
     return lastTransition_;
   }
 
   std::shared_ptr<FileBlock> TestSourceProcessor::openFile() {
+    //make the services available
+    ServiceRegistry::Operate operate(serviceToken_);
+
     size_t size = preg_->size();
     fb_ = source_->readFile();
     if (size < preg_->size()) {
@@ -217,6 +237,9 @@ namespace edm::test {
           << "closeFile given a FileBlock that does not correspond to the one returned by openFile";
     }
     if (fb_) {
+      //make the services available
+      ServiceRegistry::Operate operate(serviceToken_);
+
       source_->closeFile(fb_.get(), false);
     }
   }
@@ -225,12 +248,15 @@ namespace edm::test {
     if (lastTransition_.itemType() != edm::InputSource::ItemType::IsRun) {
       throw cms::Exception("NotARun") << "The last transition is " << name(lastTransition_.itemType()) << " not a Run";
     }
+    //make the services available
+    ServiceRegistry::Operate operate(serviceToken_);
+
     //NOTE: should probably handle merging as well
     runPrincipal_ = principalCache_.getAvailableRunPrincipalPtr();
     runPrincipal_->setAux(*source_->runAuxiliary());
     source_->readRun(*runPrincipal_, *historyAppender_);
 
-    return edm::test::RunFromSource(runPrincipal_);
+    return edm::test::RunFromSource(runPrincipal_, serviceToken_);
   }
 
   edm::test::LuminosityBlockFromSource TestSourceProcessor::readLuminosityBlock() {
@@ -239,25 +265,30 @@ namespace edm::test {
           << "The last transition is " << name(lastTransition_.itemType()) << " not a LuminosityBlock";
     }
 
+    //make the services available
+    ServiceRegistry::Operate operate(serviceToken_);
+
     lumiPrincipal_ = principalCache_.getAvailableLumiPrincipalPtr();
     assert(lumiPrincipal_);
     lumiPrincipal_->setAux(*source_->luminosityBlockAuxiliary());
     source_->readLuminosityBlock(*lumiPrincipal_, *historyAppender_);
 
-    return edm::test::LuminosityBlockFromSource(lumiPrincipal_);
+    return edm::test::LuminosityBlockFromSource(lumiPrincipal_, serviceToken_);
   }
 
   edm::test::EventFromSource TestSourceProcessor::readEvent() {
     if (lastTransition_.itemType() != edm::InputSource::ItemType::IsEvent) {
       throw cms::Exception("NotAnEvent") << "The last transition is " << name(lastTransition_.itemType())
                                          << " not a Event";
     }
+    //make the services available
+    ServiceRegistry::Operate operate(serviceToken_);
 
     auto& event = principalCache_.eventPrincipal(0);
     StreamContext streamContext(event.streamID(), &processContext_);
 
     source_->readEvent(event, streamContext);
 
-    return edm::test::EventFromSource(event);
+    return edm::test::EventFromSource(event, serviceToken_);
   }
 }  // namespace edm::test