Remove SubProcess from EventSetup code

Author: wddgit

FWCore/Framework/bin/cmsRun.cpp

@@ -272,10 +272,6 @@ int main(int argc, const char* argv[]) {
         context = "Calling beginJob";
         proc->beginJob();
 
-        // EventSetupsController uses pointers to the ParameterSet
-        // owned by ProcessDesc while it is dealing with sharing of
-        // ESProducers. Therefore the ProcessDesc needs to be kept
-        // alive until the beginJob transition has finished.
         processDesc.reset();
 
         context =

FWCore/Framework/interface/ComponentFactory.h

@@ -1,11 +1,11 @@
+// -*- C++ -*-
 #ifndef Framework_ComponentFactory_h
 #define Framework_ComponentFactory_h
-// -*- C++ -*-
 //
 // Package:     Framework
 // Class  :     ComponentFactory
 //
-/**\class ComponentFactory ComponentFactory.h FWCore/Framework/interface/ComponentFactory.h
+/**\class edm::eventsetup::ComponentFactory
 
  Description: Factory for building the Factories for the various 'plug-in' components needed for the EventSetup
 
@@ -22,7 +22,7 @@
 #include <string>
 #include <map>
 #include <memory>
-#include <exception>
+#include <sstream>
 
 // user include files
 #include "FWCore/PluginManager/interface/PluginFactory.h"
@@ -40,23 +40,23 @@ namespace edm {
 
   namespace eventsetup {
     class EventSetupProvider;
-    class EventSetupsController;
 
     template <typename T>
     class ComponentFactory {
     public:
       ComponentFactory() : makers_() {}
-      //~ComponentFactory();
+      ComponentFactory(const ComponentFactory&) = delete;
+      ComponentFactory(ComponentFactory&&) = delete;
+      ComponentFactory& operator=(ComponentFactory&&) = delete;
+      const ComponentFactory& operator=(const ComponentFactory&) = delete;
 
       typedef ComponentMakerBase<T> Maker;
       typedef std::map<std::string, std::shared_ptr<Maker const>> MakerMap;
       typedef typename T::base_type base_type;
       // ---------- const member functions ---------------------
-      std::shared_ptr<base_type> addTo(EventSetupsController& esController,
-                                       EventSetupProvider& iProvider,
+      std::shared_ptr<base_type> addTo(EventSetupProvider& iProvider,
                                        edm::ParameterSet& iConfiguration,
-                                       ModuleTypeResolverMaker const* resolverMaker,
-                                       bool replaceExisting = false) const {
+                                       ModuleTypeResolverMaker const* resolverMaker) const {
         std::string modtype = iConfiguration.template getParameter<std::string>("@module_type");
         //cerr << "Factory: module_type = " << modtype << endl;
         typename MakerMap::iterator it = makers_.find(modtype);
@@ -74,9 +74,8 @@ namespace edm {
         }
 
         try {
-          return convertException::wrap([&]() -> std::shared_ptr<base_type> {
-            return maker->addTo(esController, iProvider, iConfiguration, replaceExisting);
-          });
+          return convertException::wrap(
+              [&]() -> std::shared_ptr<base_type> { return maker->addTo(iProvider, iConfiguration); });
         } catch (cms::Exception& iException) {
           std::string edmtype = iConfiguration.template getParameter<std::string>("@module_edm_type");
           std::string label = iConfiguration.template getParameter<std::string>("@module_label");
@@ -94,10 +93,6 @@ namespace edm {
       // ---------- member functions ---------------------------
 
     private:
-      ComponentFactory(const ComponentFactory&);  // stop default
-
-      const ComponentFactory& operator=(const ComponentFactory&);  // stop default
-
       // ---------- member data --------------------------------
       //Creating a new component is not done across threads
       CMS_SA_ALLOW mutable MakerMap makers_;

FWCore/Framework/interface/ComponentMaker.h

@@ -1,11 +1,11 @@
+// -*- C++ -*-
 #ifndef Framework_ComponentMaker_h
 #define Framework_ComponentMaker_h
-// -*- C++ -*-
 //
 // Package:     Framework
 // Class  :     ComponentMaker
 //
-/**\class ComponentMaker ComponentMaker.h FWCore/Framework/interface/ComponentMaker.h
+/**\class edm::eventsetup::ComponentMaker
 
  Description: <one line class summary>
 
@@ -28,16 +28,17 @@
 #include "FWCore/Framework/interface/ComponentDescription.h"
 #include "FWCore/Framework/interface/ESProductResolverProvider.h"
 #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescriptionFiller.h"
 #include "FWCore/Utilities/interface/ConvertException.h"
-
-// forward declarations
+#include "FWCore/Utilities/interface/Exception.h"
 
 namespace edm {
   namespace eventsetup {
+
+    // forward declarations
     class EventSetupProvider;
-    class EventSetupsController;
-    class ESProductResolverProvider;
 
     class ComponentMakerBaseHelper {
     public:
@@ -51,10 +52,7 @@ namespace edm {
     class ComponentMakerBase : public ComponentMakerBaseHelper {
     public:
       typedef typename T::base_type base_type;
-      virtual std::shared_ptr<base_type> addTo(EventSetupsController& esController,
-                                               EventSetupProvider& iProvider,
-                                               ParameterSet& iConfiguration,
-                                               bool replaceExisting) const = 0;
+      virtual std::shared_ptr<base_type> addTo(EventSetupProvider& iProvider, ParameterSet& iConfiguration) const = 0;
     };
 
     template <class T, class TComponent>
@@ -65,15 +63,8 @@ namespace edm {
       const ComponentMaker& operator=(const ComponentMaker&) = delete;  // stop default
       typedef typename T::base_type base_type;
 
-      // ---------- const member functions ---------------------
-      std::shared_ptr<base_type> addTo(EventSetupsController& esController,
-                                       EventSetupProvider& iProvider,
-                                       ParameterSet& iConfiguration,
-                                       bool replaceExisting) const override;
-
-      // ---------- static member functions --------------------
+      std::shared_ptr<base_type> addTo(EventSetupProvider& iProvider, ParameterSet& iConfiguration) const override;
 
-      // ---------- member functions ---------------------------
     private:
       void setDescription(ESProductResolverProvider* iProv, const ComponentDescription& iDesc) const {
         iProv->setDescription(iDesc);
@@ -89,19 +80,11 @@ namespace edm {
       void setDescription(void*, const ComponentDescription&) const {}
       void setDescriptionForFinder(void*, const ComponentDescription&) const {}
       void setPostConstruction(void*, const edm::ParameterSet&) const {}
-      // ---------- member data --------------------------------
     };
 
     template <class T, class TComponent>
     std::shared_ptr<typename ComponentMaker<T, TComponent>::base_type> ComponentMaker<T, TComponent>::addTo(
-        EventSetupsController& esController,
-        EventSetupProvider& iProvider,
-        ParameterSet& iConfiguration,
-        bool replaceExisting) const {
-      // This adds components to the EventSetupProvider for the process. It might
-      // make a new component then add it or reuse a component from an earlier
-      // SubProcess or the top level process and add that.
-
+        EventSetupProvider& iProvider, ParameterSet& iConfiguration) const {
       {
         auto modtype = iConfiguration.getParameter<std::string>("@module_type");
         auto moduleLabel = iConfiguration.getParameter<std::string>("@module_label");
@@ -119,48 +102,15 @@ namespace edm {
           throw;
         }
       }
-
-      if (!replaceExisting) {
-        std::shared_ptr<typename T::base_type> alreadyMadeComponent =
-            T::getComponentAndRegisterProcess(esController, iConfiguration);
-
-        if (alreadyMadeComponent) {
-          // This is for the case when a component is shared between
-          // a SubProcess and a previous SubProcess or the top level process
-          // because the component has an identical configuration to a component
-          // from the top level process or earlier SubProcess.
-          std::shared_ptr<TComponent> component(
-              std::static_pointer_cast<TComponent, typename T::base_type>(alreadyMadeComponent));
-          T::addTo(iProvider, component, iConfiguration, true);
-          return component;
-        }
-      }
-
       std::shared_ptr<TComponent> component = std::make_shared<TComponent>(iConfiguration);
       ComponentDescription description = this->createComponentDescription(iConfiguration);
 
       this->setDescription(component.get(), description);
       this->setDescriptionForFinder(component.get(), description);
       this->setPostConstruction(component.get(), iConfiguration);
 
-      if (replaceExisting) {
-        // This case is for ESProducers where in the first pass
-        // the algorithm thought the component could be shared
-        // across SubProcess's because there was an ESProducer
-        // from a previous process with an identical configuration.
-        // But in a later check it was determined that sharing was not
-        // possible because other components associated with the
-        // same record or records that record depends on had
-        // differing configurations.
-        T::replaceExisting(iProvider, component);
-      } else {
-        // This is for the case when a new component is being constructed.
-        // All components for the top level process fall in this category.
-        // Or it could be a SubProcess where neither the top level process
-        // nor any prior SubProcess had a component with exactly the same configuration.
-        T::addTo(iProvider, component, iConfiguration, false);
-        T::putComponent(esController, iConfiguration, component);
-      }
+      T::addTo(iProvider, component);
+
       return component;
     }
   }  // namespace eventsetup

FWCore/Framework/interface/EventProcessor.h

@@ -8,6 +8,16 @@ configured in the user's main() function, and is set running.
 
 ----------------------------------------------------------------------*/
 
+#include <atomic>
+#include <exception>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include "oneapi/tbb/task_group.h"
+
 #include "DataFormats/Provenance/interface/ProcessHistoryID.h"
 #include "DataFormats/Provenance/interface/RunID.h"
 #include "DataFormats/Provenance/interface/LuminosityBlockID.h"
@@ -34,17 +44,6 @@ configured in the user's main() function, and is set running.
 #include "FWCore/Utilities/interface/get_underlying_safe.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 
-#include "oneapi/tbb/task_group.h"
-
-#include <atomic>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-#include <exception>
-#include <mutex>
-
 namespace edm {
 
   class ExceptionCollector;
@@ -368,10 +367,6 @@ namespace edm {
 
     bool firstEventInBlock_ = true;
 
-    typedef std::set<std::pair<std::string, std::string>> ExcludedData;
-    typedef std::map<std::string, ExcludedData> ExcludedDataMap;
-    ExcludedDataMap eventSetupDataToExcludeFromPrefetching_;
-
     bool printDependencies_ = false;
     bool deleteNonConsumedUnscheduledModules_ = true;
     bool needToCallNext_ = true;

FWCore/Framework/interface/EventSetupProvider.h

@@ -18,34 +18,30 @@
 // Created:     Thu Mar 24 14:10:07 EST 2005
 //
 
-#include "FWCore/Utilities/interface/propagate_const.h"
-
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
+#include "FWCore/Utilities/interface/propagate_const.h"
+
 // forward declarations
 namespace edm {
   class ActivityRegistry;
   class EventSetupImpl;
   class EventSetupRecordIntervalFinder;
   class IOVSyncValue;
-  class ModuleTypeResolverMaker;
-  class ParameterSet;
 
   namespace eventsetup {
     struct ComponentDescription;
     class DataKey;
     class ESProductResolverProvider;
-    class EventSetupRecordImpl;
+    class ESRecordsToProductResolverIndices;
     class EventSetupRecordKey;
     class EventSetupRecordProvider;
-    class EventSetupsController;
     class NumberOfConcurrentIOVs;
-    class ParameterSetIDHolder;
-    class ESRecordsToProductResolverIndices;
 
     class EventSetupProvider {
     public:
@@ -56,9 +52,7 @@ namespace edm {
       typedef std::multimap<RecordName, DataKeyInfo> RecordToDataMap;
       typedef std::map<ComponentDescription, RecordToDataMap> PreferredProviderInfo;
 
-      EventSetupProvider(ActivityRegistry const*,
-                         unsigned subProcessIndex = 0U,
-                         PreferredProviderInfo const* iInfo = nullptr);
+      EventSetupProvider(ActivityRegistry const*, PreferredProviderInfo const* iInfo = nullptr);
       EventSetupProvider(EventSetupProvider const&) = delete;
       EventSetupProvider const& operator=(EventSetupProvider const&) = delete;
 
@@ -78,7 +72,6 @@ namespace edm {
       EventSetupImpl const& eventSetupImpl() const { return *eventSetupImpl_; }
 
       void add(std::shared_ptr<ESProductResolverProvider>);
-      void replaceExisting(std::shared_ptr<ESProductResolverProvider>);
       void add(std::shared_ptr<EventSetupRecordIntervalFinder>);
 
       void finishConfiguration(NumberOfConcurrentIOVs const&, bool& hasNonconcurrentFinder);
@@ -89,30 +82,10 @@ namespace edm {
       ///Used when testing that all code properly updates on IOV changes of all Records
       void forceCacheClear();
 
-      void checkESProducerSharing(
-          ModuleTypeResolverMaker const* resolverMaker,
-          EventSetupProvider& precedingESProvider,
-          std::set<ParameterSetIDHolder>& sharingCheckDone,
-          std::map<EventSetupRecordKey, std::vector<ComponentDescription const*>>& referencedESProducers,
-          EventSetupsController& esController);
-
       void updateLookup();
 
-      bool doRecordsMatch(EventSetupProvider& precedingESProvider,
-                          EventSetupRecordKey const& eventSetupRecordKey,
-                          std::map<EventSetupRecordKey, bool>& allComponentsMatch,
-                          EventSetupsController const& esController);
-
-      void fillReferencedDataKeys(EventSetupRecordKey const& eventSetupRecordKey);
-
-      void resetRecordToResolverPointers();
-
       void clearInitializationData();
 
-      unsigned subProcessIndex() const { return subProcessIndex_; }
-
-      static void logInfoWhenSharing(ParameterSet const& iConfiguration);
-
       /// Intended for use only in tests
       void addRecord(const EventSetupRecordKey& iKey);
       void setPreferredProviderInfo(PreferredProviderInfo const& iInfo);
@@ -142,21 +115,14 @@ namespace edm {
 
       ActivityRegistry const* activityRegistry_;
 
-      bool mustFinishConfiguration_;
-      unsigned subProcessIndex_;
       propagate_const<std::shared_ptr<EventSetupImpl>> eventSetupImpl_;
 
       // The following are all used only during initialization and then cleared.
 
       std::unique_ptr<PreferredProviderInfo> preferredProviderInfo_;
       std::unique_ptr<std::vector<std::shared_ptr<EventSetupRecordIntervalFinder>>> finders_;
       std::unique_ptr<std::vector<std::shared_ptr<ESProductResolverProvider>>> dataProviders_;
-      std::unique_ptr<std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription const*>>> referencedDataKeys_;
-      std::unique_ptr<std::map<EventSetupRecordKey, std::vector<std::shared_ptr<EventSetupRecordIntervalFinder>>>>
-          recordToFinders_;
-      std::unique_ptr<std::map<ParameterSetIDHolder, std::set<EventSetupRecordKey>>> psetIDToRecordKey_;
       std::unique_ptr<std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription>>> recordToPreferred_;
-      std::unique_ptr<std::set<EventSetupRecordKey>> recordsWithALooperResolver_;
     };
 
   }  // namespace eventsetup