Remove remnants of SubProcess from Service System

wddgit · wddgit · commit 7ae4f6e0f4bb · 2025-06-12T00:11:55.000+02:00
diff --git a/CommonTools/UtilAlgos/interface/TFileService.h b/CommonTools/UtilAlgos/interface/TFileService.h
@@ -91,11 +91,4 @@ class TFileService {
   void postModuleGlobal(edm::GlobalContext const &, edm::ModuleCallingContext const &);
 };
 
-namespace edm {
-  namespace service {
-    // This function is needed so that there will be only one instance
-    // of this service per process when "subprocesses" are being used.
-    inline bool isProcessWideService(TFileService const *) { return true; }
-  }  // namespace service
-}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ScheduleItems.h b/FWCore/Framework/interface/ScheduleItems.h
@@ -38,8 +38,7 @@ namespace edm {
     ServiceToken initServices(std::vector<ParameterSet>& servicePSets,
                               ParameterSet& processPSet,
                               ServiceToken const& iToken,
-                              serviceregistry::ServiceLegacy iLegacy,
-                              bool associate);
+                              serviceregistry::ServiceLegacy iLegacy);
 
     ServiceToken addTNS(ParameterSet const& parameterSet, ServiceToken const& token);
 
diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
@@ -428,7 +428,7 @@ namespace edm {
 
     //initialize the services
     auto& serviceSets = processDesc->getServicesPSets();
-    ServiceToken token = items.initServices(serviceSets, *parameterSet, iToken, iLegacy, true);
+    ServiceToken token = items.initServices(serviceSets, *parameterSet, iToken, iLegacy);
     serviceToken_ = items.addTNS(*parameterSet, token);
 
     //make the services available
diff --git a/FWCore/Framework/src/ScheduleItems.cc b/FWCore/Framework/src/ScheduleItems.cc
@@ -36,10 +36,9 @@ namespace edm {
   ServiceToken ScheduleItems::initServices(std::vector<ParameterSet>& pServiceSets,
                                            ParameterSet& parameterSet,
                                            ServiceToken const& iToken,
-                                           serviceregistry::ServiceLegacy iLegacy,
-                                           bool associate) {
+                                           serviceregistry::ServiceLegacy iLegacy) {
     //create the services
-    ServiceToken token(ServiceRegistry::createSet(pServiceSets, iToken, iLegacy, associate));
+    ServiceToken token(ServiceRegistry::createSet(pServiceSets, iToken, iLegacy));
 
     //see if any of the Services have to have their PSets stored
     for (auto const& item : pServiceSets) {
diff --git a/FWCore/MessageService/plugins/MessageLogger.h b/FWCore/MessageService/plugins/MessageLogger.h
@@ -192,8 +192,6 @@ namespace edm {
 
     };  // MessageLogger
 
-    inline bool isProcessWideService(MessageLogger const*) { return true; }
-
   }  // namespace service
 
 }  // namespace edm
diff --git a/FWCore/ServiceRegistry/interface/ActivityRegistry.h b/FWCore/ServiceRegistry/interface/ActivityRegistry.h
@@ -45,13 +45,7 @@ to this file that go beyond the obvious cut and paste type of edits.
   reason to do otherwise, the recommended choice is following the pattern of
   Pre transitions forward and Post transitions in reverse. If you make another
   choice, please document your reasoning with comments in the code.
-  3. The signal needs to be added to either connectGlobals or connectLocals
-  in the ActivityRegistry.cc file, depending on whether a signal is seen
-  by children or parents when there are SubProcesses. For example, source
-  signals are only generated in the top level process and should be seen
-  by all child SubProcesses so they are in connectGlobals. Most signals
-  however belong in connectLocals. It does not really matter in jobs
-  without at least one SubProcess.
+  3. Each signal needs to be added to the connect function.
   4. Each signal also needs to be added in copySlotsFrom in
   ActivityRegistry.cc. Whether it uses copySlotsToFrom or
   copySlotsToFromReverse depends on the same ordering issue as the connect
@@ -1135,23 +1129,12 @@ namespace edm {
     ///forwards our signals to slots connected to iOther
     void connect(ActivityRegistry& iOther);
 
-    ///forwards our subprocess independent signals to slots connected to iOther
-    ///forwards iOther's subprocess dependent signals to slots connected to this
-    void connectToSubProcess(ActivityRegistry& iOther);
-
     ///copy the slots from iOther and connect them directly to our own
     /// this allows us to 'forward' signals more efficiently,
     /// BUT if iOther gains new slots after this call, we will not see them
     /// This is also careful to keep the order of the slots proper
     /// for services.
     void copySlotsFrom(ActivityRegistry& iOther);
-
-  private:
-    // forwards subprocess independent signals to slots connected to iOther
-    void connectGlobals(ActivityRegistry& iOther);
-
-    // forwards subprocess dependent signals to slots connected to iOther
-    void connectLocals(ActivityRegistry& iOther);
   };
 }  // namespace edm
 #undef AR_WATCH_USING_METHOD
diff --git a/FWCore/ServiceRegistry/interface/ProcessContext.h b/FWCore/ServiceRegistry/interface/ProcessContext.h
@@ -31,18 +31,11 @@ namespace edm {
     std::string const& processName() const { return processConfiguration_->processName(); }
     ParameterSetID const& parameterSetID() const { return processConfiguration_->parameterSetID(); }
     ProcessConfiguration const* processConfiguration() const { return processConfiguration_; }
-    bool isSubProcess() const { return parentProcessContext_ != nullptr; }
-    ProcessContext const& parentProcessContext() const;
 
     void setProcessConfiguration(ProcessConfiguration const* processConfiguration);
-    void setParentProcessContext(ProcessContext const* parentProcessContext);
 
   private:
     ProcessConfiguration const* processConfiguration_;
-
-    // If this is a SubProcess this points to the parent process,
-    // otherwise it is null.
-    ProcessContext const* parentProcessContext_;
   };
 
   std::ostream& operator<<(std::ostream&, ProcessContext const&);
diff --git a/FWCore/ServiceRegistry/interface/ServiceLegacy.h b/FWCore/ServiceRegistry/interface/ServiceLegacy.h
@@ -26,7 +26,7 @@
 
 namespace edm {
   namespace serviceregistry {
-    enum ServiceLegacy { kOverlapIsError, kTokenOverrides, kConfigurationOverrides };
+    enum ServiceLegacy { kOverlapIsError, kTokenOverrides };
   }
 }  // namespace edm
 
diff --git a/FWCore/ServiceRegistry/interface/ServiceMaker.h b/FWCore/ServiceRegistry/interface/ServiceMaker.h
@@ -1,11 +1,11 @@
+// -*- C++ -*-
 #ifndef FWCore_ServiceRegistry_ServiceMaker_h
 #define FWCore_ServiceRegistry_ServiceMaker_h
-// -*- C++ -*-
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceMaker
 //
-/**\class ServiceMaker ServiceMaker.h FWCore/ServiceRegistry/interface/ServiceMaker.h
+/**\class edm::serviceregistry::ServiceMaker
 
  Description: Used to make an instance of a Service
 
@@ -86,10 +86,6 @@ namespace edm {
       bool saveConfiguration() const override {
         return ServiceMakerBase::testSaveConfiguration(static_cast<typename TMaker::concrete_t const*>(nullptr));
       }
-
-      bool processWideService() const override {
-        return service::isProcessWideService(static_cast<typename TMaker::concrete_t const*>(nullptr));
-      }
     };
   }  // namespace serviceregistry
 }  // namespace edm
diff --git a/FWCore/ServiceRegistry/interface/ServiceMakerBase.h b/FWCore/ServiceRegistry/interface/ServiceMakerBase.h
@@ -1,11 +1,11 @@
+// -*- C++ -*-
 #ifndef FWCore_ServiceRegistry_ServiceMakerBase_h
 #define FWCore_ServiceRegistry_ServiceMakerBase_h
-// -*- C++ -*-
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceMakerBase
 //
-/**\class ServiceMakerBase ServiceMakerBase.h FWCore/ServiceRegistry/interface/ServiceMakerBase.h
+/**\class edm::serviceregistry::ServiceMakerBase
 
  Description: Base class for Service Makers
 
@@ -25,10 +25,6 @@ namespace edm {
   class ParameterSet;
   class ActivityRegistry;
 
-  namespace service {
-    inline bool isProcessWideService(void const* /*service*/) { return false; }
-  }  // namespace service
-
   namespace serviceregistry {
     class SaveConfiguration;
     class ServiceWrapperBase;
@@ -46,8 +42,6 @@ namespace edm {
 
       virtual bool make(ParameterSet const&, ActivityRegistry&, ServicesManager&) const = 0;
 
-      virtual bool processWideService() const = 0;
-
       virtual bool saveConfiguration() const = 0;
 
       // ---------- static member functions --------------------
diff --git a/FWCore/ServiceRegistry/interface/ServiceRegistry.h b/FWCore/ServiceRegistry/interface/ServiceRegistry.h
@@ -93,10 +93,7 @@ namespace edm {
 
   public:  // Made public (temporarily) at the request of Emilio Meschi.
     static ServiceToken createSet(std::vector<ParameterSet>&);
-    static ServiceToken createSet(std::vector<ParameterSet>&,
-                                  ServiceToken,
-                                  serviceregistry::ServiceLegacy,
-                                  bool associate = true);
+    static ServiceToken createSet(std::vector<ParameterSet>&, ServiceToken, serviceregistry::ServiceLegacy);
     /// create a service token that holds the service defined by iService
     template <typename T>
     static ServiceToken createContaining(std::unique_ptr<T> iService) {
diff --git a/FWCore/ServiceRegistry/interface/ServicesManager.h b/FWCore/ServiceRegistry/interface/ServicesManager.h
@@ -63,10 +63,7 @@ namespace edm {
              Conflicts over Services provided by both the iToken and iConfiguration
              are resolved based on the value of iLegacy
          */
-      ServicesManager(ServiceToken iToken,
-                      ServiceLegacy iLegacy,
-                      std::vector<ParameterSet>& iConfiguration,
-                      bool associate = true);
+      ServicesManager(ServiceToken iToken, ServiceLegacy iLegacy, std::vector<ParameterSet>& iConfiguration);
 
       ServicesManager(ServicesManager const&) = delete;                   // stop default
       ServicesManager const& operator=(ServicesManager const&) = delete;  // stop default
diff --git a/FWCore/ServiceRegistry/src/ActivityRegistry.cc b/FWCore/ServiceRegistry/src/ActivityRegistry.cc
@@ -53,7 +53,7 @@ namespace edm {
     }
   }  // namespace signalslot
 
-  void ActivityRegistry::connectGlobals(ActivityRegistry& iOther) {
+  void ActivityRegistry::connect(ActivityRegistry& iOther) {
     preallocateSignal_.connect(std::cref(iOther.preallocateSignal_));
     eventSetupConfigurationSignal_.connect(std::cref(iOther.eventSetupConfigurationSignal_));
     beginProcessingSignal_.connect(std::cref(iOther.beginProcessingSignal_));
@@ -95,9 +95,7 @@ namespace edm {
     esSyncIOVQueuingSignal_.connect(std::cref(iOther.esSyncIOVQueuingSignal_));
     preESSyncIOVSignal_.connect(std::cref(iOther.preESSyncIOVSignal_));
     postESSyncIOVSignal_.connect(std::cref(iOther.postESSyncIOVSignal_));
-  }
 
-  void ActivityRegistry::connectLocals(ActivityRegistry& iOther) {
     preBeginJobSignal_.connect(std::cref(iOther.preBeginJobSignal_));
     lookupInitializationCompleteSignal_.connect(std::cref(iOther.lookupInitializationCompleteSignal_));
 
@@ -260,16 +258,6 @@ namespace edm {
     postESModuleRegistrationSignal_.connect(std::cref(iOther.postESModuleRegistrationSignal_));
   }
 
-  void ActivityRegistry::connect(ActivityRegistry& iOther) {
-    connectGlobals(iOther);
-    connectLocals(iOther);
-  }
-
-  void ActivityRegistry::connectToSubProcess(ActivityRegistry& iOther) {
-    connectGlobals(iOther);       // child sees parents global signals
-    iOther.connectLocals(*this);  // parent see childs global signals
-  }
-
   void ActivityRegistry::copySlotsFrom(ActivityRegistry& iOther) {
     copySlotsToFrom(preallocateSignal_, iOther.preallocateSignal_);
     copySlotsToFrom(eventSetupConfigurationSignal_, iOther.eventSetupConfigurationSignal_);
diff --git a/FWCore/ServiceRegistry/src/ProcessContext.cc b/FWCore/ServiceRegistry/src/ProcessContext.cc
@@ -5,25 +5,12 @@
 
 namespace edm {
 
-  ProcessContext::ProcessContext() : processConfiguration_(nullptr), parentProcessContext_(nullptr) {}
-
-  ProcessContext const& ProcessContext::parentProcessContext() const {
-    if (!isSubProcess()) {
-      throw Exception(errors::LogicError)
-          << "ProcessContext::parentProcessContext This function should only be called for SubProcesses.\n"
-          << "If necessary, you can check this by calling isSubProcess first.\n";
-    }
-    return *parentProcessContext_;
-  }
+  ProcessContext::ProcessContext() : processConfiguration_(nullptr) {}
 
   void ProcessContext::setProcessConfiguration(ProcessConfiguration const* processConfiguration) {
     processConfiguration_ = processConfiguration;
   }
 
-  void ProcessContext::setParentProcessContext(ProcessContext const* parentProcessContext) {
-    parentProcessContext_ = parentProcessContext;
-  }
-
   std::ostream& operator<<(std::ostream& os, ProcessContext const& pc) {
     os << "ProcessContext: ";
     if (pc.processConfiguration()) {
@@ -32,9 +19,6 @@ namespace edm {
       os << "invalid\n";
       return os;
     }
-    if (pc.isSubProcess()) {
-      os << "    parent " << pc.parentProcessContext();
-    }
     return os;
   }
 }  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/ServiceRegistry.cc b/FWCore/ServiceRegistry/src/ServiceRegistry.cc
@@ -80,10 +80,9 @@ namespace edm {
 
   ServiceToken ServiceRegistry::createSet(std::vector<ParameterSet>& iPS,
                                           ServiceToken iToken,
-                                          serviceregistry::ServiceLegacy iLegacy,
-                                          bool associate) {
+                                          serviceregistry::ServiceLegacy iLegacy) {
     using namespace serviceregistry;
-    auto returnValue = std::make_shared<ServicesManager>(iToken, iLegacy, iPS, associate);
+    auto returnValue = std::make_shared<ServicesManager>(iToken, iLegacy, iPS);
     return ServiceToken(returnValue);
   }
 
diff --git a/FWCore/ServiceRegistry/src/ServicesManager.cc b/FWCore/ServiceRegistry/src/ServicesManager.cc
@@ -71,10 +71,8 @@ namespace edm {
 
     ServicesManager::ServicesManager(ServiceToken iToken,
                                      ServiceLegacy iLegacy,
-                                     std::vector<ParameterSet>& iConfiguration,
-                                     bool associate)
-        : associatedManager_(associate ? iToken.manager_ : std::shared_ptr<ServicesManager>()),
-          type2Maker_(new Type2Maker) {
+                                     std::vector<ParameterSet>& iConfiguration)
+        : associatedManager_(iToken.manager_), type2Maker_(new Type2Maker) {
       fillListOfMakers(iConfiguration);
 
       //find overlaps between services in iToken and iConfiguration
@@ -132,38 +130,9 @@ namespace edm {
               type2Maker_->erase(itFound);
             }
             break;
-          case kConfigurationOverrides:
-            //get all the services from the Configuration, except process wide services
-            type2Service_ = iToken.manager_->type2Service_;
-
-            //now remove the ones we do not want
-            for (IntersectionType::iterator itType = intersection.begin(), itTypeEnd = intersection.end();
-                 itType != itTypeEnd;
-                 ++itType) {
-              Type2Maker::iterator itFound = type2Maker_->find(*itType);
-              if (itFound->second.maker_->processWideService()) {
-                // This is a process wide service, so the token overrides the configuration.
-                //HLT needs it such that even if a service isn't created we store its PSet if needed
-                if (itFound->second.maker_->saveConfiguration()) {
-                  itFound->second.pset_->addUntrackedParameter("@save_config", true);
-                }
-                std::string type(typeDemangle(itType->name()));
-                LogInfo("Configuration") << "Warning: You have reconfigured service\n"
-                                         << "'" << type << "' in a subprocess.\n"
-                                         << "This service has already been configured.\n"
-                                         << "This particular service may not be reconfigured in a subprocess.\n"
-                                         << "The reconfiguration will be ignored.\n";
-                type2Maker_->erase(itFound);
-              } else {
-                // This is not a process wide service, so the configuration overrides the token.
-                type2Service_.erase(type2Service_.find(*itType));
-              }
-            }
-            break;
         }
         //make sure our signals are propagated to our 'inherited' Services
-        if (associate)
-          registry_.copySlotsFrom(associatedManager_->registry_);
+        registry_.copySlotsFrom(associatedManager_->registry_);
       }
       createServices();
     }
diff --git a/FWCore/ServiceRegistry/test/servicesmanager_t.cppunit.cc b/FWCore/ServiceRegistry/test/servicesmanager_t.cppunit.cc
@@ -192,19 +192,6 @@ void testServicesManager::legacyTest() {
 
     CPPUNIT_ASSERT(1 == sm.get<TestService>().value());
   }
-  {
-    std::vector<edm::ParameterSet> pss;
-
-    edm::ParameterSet ps;
-    ps.addParameter("@service_type", typeName);
-    int value = 2;
-    ps.addParameter("value", value);
-    pss.push_back(ps);
-
-    ServicesManager sm(legacyToken, kConfigurationOverrides, pss);
-
-    CPPUNIT_ASSERT(2 == sm.get<TestService>().value());
-  }
   {
     try {
       std::vector<edm::ParameterSet> pss;
diff --git a/FWCore/Services/plugins/CPU.cc b/FWCore/Services/plugins/CPU.cc
@@ -70,7 +70,6 @@ namespace edm {
       void postEndJob();
     };
 
-    inline bool isProcessWideService(CPU const *) { return true; }
   }  // namespace service
 }  // namespace edm
 
diff --git a/FWCore/Services/plugins/CondorStatusUpdater.cc b/FWCore/Services/plugins/CondorStatusUpdater.cc
@@ -83,7 +83,6 @@ namespace edm {
 
       std::uint_least64_t m_lastEventCount = 0;
     };
-    inline bool isProcessWideService(CondorStatusService const *) { return true; }
 
   }  // namespace service
 
diff --git a/FWCore/Services/plugins/InitRootHandlers.cc b/FWCore/Services/plugins/InitRootHandlers.cc
@@ -142,8 +142,6 @@ namespace edm {
       std::shared_ptr<const void> sigFpeHandler_;
     };
 
-    inline bool isProcessWideService(InitRootHandlers const*) { return true; }
-
   }  // end of namespace service
 }  // end of namespace edm
 
diff --git a/FWCore/Services/plugins/ResourceInformationService.cc b/FWCore/Services/plugins/ResourceInformationService.cc
@@ -79,8 +79,6 @@ namespace edm {
       bool verbose_;
     };
 
-    inline bool isProcessWideService(ResourceInformationService const*) { return true; }
-
     ResourceInformationService::ResourceInformationService(ParameterSet const& pset, ActivityRegistry& iRegistry)
         : verbose_(pset.getUntrackedParameter<bool>("verbose")) {
       iRegistry.watchPostBeginJob(this, &ResourceInformationService::postBeginJob);
diff --git a/FWCore/Services/plugins/ZombieKillerService.cc b/FWCore/Services/plugins/ZombieKillerService.cc
diff --git a/FWCore/Services/src/JobReportService.h b/FWCore/Services/src/JobReportService.h
diff --git a/FWCore/Services/src/SiteLocalConfigService.h b/FWCore/Services/src/SiteLocalConfigService.h
diff --git a/FWCore/TestProcessor/src/TestProcessor.cc b/FWCore/TestProcessor/src/TestProcessor.cc
diff --git a/FWCore/TestProcessor/src/TestSourceProcessor.cc b/FWCore/TestProcessor/src/TestSourceProcessor.cc
diff --git a/HeterogeneousCore/CUDAServices/plugins/CUDAService.cc b/HeterogeneousCore/CUDAServices/plugins/CUDAService.cc
diff --git a/HeterogeneousCore/ROCmServices/plugins/ROCmService.cc b/HeterogeneousCore/ROCmServices/plugins/ROCmService.cc
diff --git a/IOPool/TFileAdaptor/src/TFileAdaptor.h b/IOPool/TFileAdaptor/src/TFileAdaptor.h
diff --git a/IgTools/IgProf/plugins/IgProfService.h b/IgTools/IgProf/plugins/IgProfService.h
diff --git a/PerfTools/JeProf/plugins/JeProfService.cc b/PerfTools/JeProf/plugins/JeProfService.cc

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`namespace edm {`
`28`	`28`	`namespace serviceregistry {`
`29`		`- enum ServiceLegacy { kOverlapIsError, kTokenOverrides, kConfigurationOverrides };`
	`29`	`+ enum ServiceLegacy { kOverlapIsError, kTokenOverrides };`
`30`	`30`	`}`
`31`	`31`	`} // namespace edm`
`32`	`32`