Merge pull request #21063 from Dr15Jones/avoidedUneededRunLumiCalls

Avoided uneeded run and luminosity block calls
cms-sw · Oct 29, 2017 · e099e08 · e099e08
2 parents d434fc9 + 332e7ad
commit e099e08
Show file tree

Hide file tree

Showing 43 changed files with 338 additions and 2,334 deletions.
diff --git a/FWCore/Framework/interface/EDAnalyzer.h b/FWCore/Framework/interface/EDAnalyzer.h
@@ -41,6 +41,11 @@ namespace edm {
 
     // Warning: the returned moduleDescription will be invalid during construction
     ModuleDescription const& moduleDescription() const { return moduleDescription_; }
+
+    static bool wantsGlobalRuns() {return true;}
+    static bool wantsGlobalLuminosityBlocks() {return true;}
+    static bool wantsStreamRuns() {return false;}
+    static bool wantsStreamLuminosityBlocks() {return false;};
 
     void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func);
 

diff --git a/FWCore/Framework/interface/EDFilter.h b/FWCore/Framework/interface/EDFilter.h
@@ -52,6 +52,11 @@ namespace edm {
     // Warning: the returned moduleDescription will be invalid during construction
     ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+    static bool wantsGlobalRuns() {return true;}
+    static bool wantsGlobalLuminosityBlocks() {return true;}
+    static bool wantsStreamRuns() {return false;}
+    static bool wantsStreamLuminosityBlocks() {return false;};
+
   private:
     bool doEvent(EventPrincipal const& ep, EventSetup const& c,
                  ActivityRegistry* act,

diff --git a/FWCore/Framework/interface/EDProducer.h b/FWCore/Framework/interface/EDProducer.h
@@ -47,6 +47,11 @@ namespace edm {
 
     // Warning: the returned moduleDescription will be invalid during construction
     ModuleDescription const& moduleDescription() const { return moduleDescription_; }
+
+    static bool wantsGlobalRuns() {return true;}
+    static bool wantsGlobalLuminosityBlocks() {return true;}
+    static bool wantsStreamRuns() {return false;}
+    static bool wantsStreamLuminosityBlocks() {return false;};
 
   private:
     bool doEvent(EventPrincipal const& ep, EventSetup const& c,

diff --git a/FWCore/Framework/interface/OutputModule.h b/FWCore/Framework/interface/OutputModule.h
@@ -81,6 +81,11 @@ namespace edm {
     static const std::string& baseType();
     static void prevalidate(ConfigurationDescriptions& );
 
+    static bool wantsGlobalRuns() {return true;}
+    static bool wantsGlobalLuminosityBlocks() {return true;}
+    static bool wantsStreamRuns() {return false;}
+    static bool wantsStreamLuminosityBlocks() {return false;};
+
     bool wantAllEvents() const {return wantAllEvents_;}
 
     BranchIDLists const* branchIDLists();

diff --git a/FWCore/Framework/interface/global/EDAnalyzer.h b/FWCore/Framework/interface/global/EDAnalyzer.h
@@ -42,7 +42,20 @@ namespace edm {
       virtual ~EDAnalyzer() {}
 #endif
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/global/EDAnalyzerBase.h b/FWCore/Framework/interface/global/EDAnalyzerBase.h
@@ -61,6 +61,11 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+      virtual bool wantsGlobalRuns() const =0;
+      virtual bool wantsGlobalLuminosityBlocks() const =0;
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
     private:
       bool doEvent(EventPrincipal const& ep, EventSetup const& c,
                    ActivityRegistry*,

diff --git a/FWCore/Framework/interface/global/EDFilter.h b/FWCore/Framework/interface/global/EDFilter.h
@@ -46,7 +46,20 @@ namespace edm {
       virtual ~EDFilter() = default;
 #endif
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/global/EDFilterBase.h b/FWCore/Framework/interface/global/EDFilterBase.h
@@ -63,6 +63,11 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+      virtual bool wantsGlobalRuns() const =0;
+      virtual bool wantsGlobalLuminosityBlocks() const =0;
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
     private:
       bool doEvent(EventPrincipal const& ep, EventSetup const& c,
                    ActivityRegistry*,

diff --git a/FWCore/Framework/interface/global/EDProducer.h b/FWCore/Framework/interface/global/EDProducer.h
@@ -40,7 +40,20 @@ namespace edm {
       EDProducer() = default;
 
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/global/EDProducerBase.h b/FWCore/Framework/interface/global/EDProducerBase.h
@@ -66,6 +66,11 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+      virtual bool wantsGlobalRuns() const =0;
+      virtual bool wantsGlobalLuminosityBlocks() const =0;
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
     private:
       bool doEvent(EventPrincipal const& ep, EventSetup const& c,
                    ActivityRegistry*,

diff --git a/FWCore/Framework/interface/global/OutputModule.h b/FWCore/Framework/interface/global/OutputModule.h
@@ -42,6 +42,12 @@ namespace edm {
 #endif
 
       // ---------- const member functions ---------------------
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
 
       // ---------- static member functions --------------------
 

diff --git a/FWCore/Framework/interface/global/OutputModuleBase.h b/FWCore/Framework/interface/global/OutputModuleBase.h
@@ -92,14 +92,22 @@ namespace edm {
       static void prevalidate(ConfigurationDescriptions& );
 
       bool wantAllEvents() const {return wantAllEvents_;}
-      
+
       BranchIDLists const* branchIDLists();
 
       ThinnedAssociationsHelper const* thinnedAssociationsHelper() const;
 
       const ModuleDescription& moduleDescription() const {
         return moduleDescription_;
       }
+
+      //Output modules always need writeRun and writeLumi to be called
+      bool wantsGlobalRuns() const {return true;}
+      bool wantsGlobalLuminosityBlocks() const {return true;}
+
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
     protected:
 
       ModuleDescription const& description() const;

diff --git a/FWCore/Framework/interface/limited/EDAnalyzer.h b/FWCore/Framework/interface/limited/EDAnalyzer.h
@@ -42,7 +42,19 @@ namespace edm {
       virtual ~EDAnalyzer() {}
 #endif
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/limited/EDAnalyzerBase.h b/FWCore/Framework/interface/limited/EDAnalyzerBase.h
@@ -62,6 +62,11 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+      virtual bool wantsGlobalRuns() const =0;
+      virtual bool wantsGlobalLuminosityBlocks() const =0;
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
       LimitedTaskQueue& queue() {

diff --git a/FWCore/Framework/interface/limited/EDFilter.h b/FWCore/Framework/interface/limited/EDFilter.h
@@ -51,7 +51,19 @@ namespace edm {
       virtual ~EDFilter() = default;
 #endif
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/limited/EDFilterBase.h b/FWCore/Framework/interface/limited/EDFilterBase.h
@@ -64,6 +64,11 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+      virtual bool wantsGlobalRuns() const =0;
+      virtual bool wantsGlobalLuminosityBlocks() const =0;
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
       LimitedTaskQueue& queue() {

diff --git a/FWCore/Framework/interface/limited/EDProducer.h b/FWCore/Framework/interface/limited/EDProducer.h
@@ -44,7 +44,19 @@ namespace edm {
       T>::Type(iPSet)... {}
 
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/limited/EDProducerBase.h b/FWCore/Framework/interface/limited/EDProducerBase.h
@@ -67,6 +67,11 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+      virtual bool wantsGlobalRuns() const =0;
+      virtual bool wantsGlobalLuminosityBlocks() const =0;
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
       LimitedTaskQueue& queue() {

diff --git a/FWCore/Framework/interface/limited/OutputModule.h b/FWCore/Framework/interface/limited/OutputModule.h
@@ -42,7 +42,13 @@ namespace edm {
 #endif
 
       // ---------- const member functions ---------------------
-
+      bool wantsStreamRuns() const final {
+        return WantsStreamRunTransitions<T...>::value;
+      }
+      bool wantsStreamLuminosityBlocks() const final {
+        return WantsStreamLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/limited/OutputModuleBase.h b/FWCore/Framework/interface/limited/OutputModuleBase.h
@@ -102,6 +102,12 @@ namespace edm {
         return moduleDescription_;
       }
 
+      //Output modules always need writeRun and writeLumi to be called
+      bool wantsGlobalRuns() const {return true;}
+      bool wantsGlobalLuminosityBlocks() const {return true;}
+      virtual bool wantsStreamRuns() const =0;
+      virtual bool wantsStreamLuminosityBlocks() const =0;
+
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
       LimitedTaskQueue& queue() {

diff --git a/FWCore/Framework/interface/moduleAbilities.h b/FWCore/Framework/interface/moduleAbilities.h
@@ -111,6 +111,34 @@ namespace edm {
     typedef edm::module::Empty Type;
   };
 
+  template<typename... VArgs>
+  struct WantsGlobalRunTransitions {
+    static constexpr bool value = CheckAbility<module::Abilities::kRunCache,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kRunSummaryCache,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kBeginRunProducer,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kEndRunProducer, VArgs...>::kHasIt;
+  };
+
+  template<typename... VArgs>
+  struct WantsGlobalLuminosityBlockTransitions {
+    static constexpr bool value = CheckAbility<module::Abilities::kLuminosityBlockCache,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kLuminosityBlockSummaryCache,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kBeginLuminosityBlockProducer,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kEndLuminosityBlockProducer, VArgs...>::kHasIt;
+  };
+
+  template<typename... VArgs>
+  struct WantsStreamRunTransitions {
+    static constexpr bool value = CheckAbility<module::Abilities::kStreamCache,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kRunSummaryCache,VArgs...>::kHasIt ;
+  };
+
+  template<typename... VArgs>
+  struct WantsStreamLuminosityBlockTransitions {
+    static constexpr bool value = CheckAbility<module::Abilities::kStreamCache,VArgs...>::kHasIt or
+    CheckAbility<module::Abilities::kLuminosityBlockSummaryCache,VArgs...>::kHasIt;
+  };
+
 }
 
 #endif
diff --git a/FWCore/Framework/interface/one/EDAnalyzer.h b/FWCore/Framework/interface/one/EDAnalyzer.h
@@ -36,7 +36,13 @@ namespace edm {
 #endif
 
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------

diff --git a/FWCore/Framework/interface/one/EDAnalyzerBase.h b/FWCore/Framework/interface/one/EDAnalyzerBase.h
@@ -63,6 +63,11 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
+      virtual bool wantsGlobalRuns() const =0;
+      virtual bool wantsGlobalLuminosityBlocks() const =0;
+      bool wantsStreamRuns() const {return false;}
+      bool wantsStreamLuminosityBlocks() const {return false;};
+
       void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func);
 
     private:

diff --git a/FWCore/Framework/interface/one/EDFilter.h b/FWCore/Framework/interface/one/EDFilter.h
@@ -35,7 +35,13 @@ namespace edm {
       //virtual ~EDFilter();
 
       // ---------- const member functions ---------------------
-
+      bool wantsGlobalRuns() const final {
+        return WantsGlobalRunTransitions<T...>::value;
+      }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return WantsGlobalLuminosityBlockTransitions<T...>::value;
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------