Merge pull request cms-sw#605 from Dr15Jones/multipleEventSupport

Multiple stream support
amassiro · Aug 25, 2013 · ac7b978 · ac7b978
2 parents bcb45fb + f6cbdb5
commit ac7b978
Show file tree

Hide file tree

Showing 69 changed files with 3,155 additions and 1,982 deletions.
diff --git a/FWCore/Framework/interface/EDAnalyzer.h b/FWCore/Framework/interface/EDAnalyzer.h
@@ -14,8 +14,13 @@ namespace edm {
 
   class ModuleCallingContext;
 
+  namespace maker {
+    template<typename T> class ModuleHolderT;
+  }
+
   class EDAnalyzer : public EDConsumerBase {
   public:
+    template <typename T> friend class maker::ModuleHolderT;
     template <typename T> friend class WorkerT;
     typedef EDAnalyzer ModuleType;
     typedef WorkerT<EDAnalyzer> WorkerType;

diff --git a/FWCore/Framework/interface/EDFilter.h b/FWCore/Framework/interface/EDFilter.h
@@ -21,11 +21,15 @@ These products should be informational products about the filter decision.
 #include <vector>
 
 namespace edm {
+  namespace maker {
+    template<typename T> class ModuleHolderT;
+  }
 
   class ModuleCallingContext;
 
   class EDFilter : public ProducerBase, public EDConsumerBase {
   public:
+    template <typename T> friend class maker::ModuleHolderT;
     template <typename T> friend class WorkerT;
     typedef EDFilter ModuleType;
     typedef WorkerT<EDFilter> WorkerType;

diff --git a/FWCore/Framework/interface/EDProducer.h b/FWCore/Framework/interface/EDProducer.h
@@ -21,9 +21,13 @@ EDProducts into an Event.
 namespace edm {
 
   class ModuleCallingContext;
+  namespace maker {
+    template<typename T> class ModuleHolderT;
+  }
 
   class EDProducer : public ProducerBase, public EDConsumerBase {
   public:
+    template <typename T> friend class maker::ModuleHolderT;
     template <typename T> friend class WorkerT;
     typedef EDProducer ModuleType;
     typedef WorkerT<EDProducer> WorkerType;

diff --git a/FWCore/Framework/interface/EventProcessor.h b/FWCore/Framework/interface/EventProcessor.h
@@ -16,6 +16,7 @@ configured in the user's main() function, and is set running.
 #include "FWCore/Framework/interface/IEventProcessor.h"
 #include "FWCore/Framework/src/PrincipalCache.h"
 #include "FWCore/Framework/src/SignallingProductRegistry.h"
+#include "FWCore/Framework/src/PreallocationConfiguration.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -357,6 +358,8 @@ namespace edm {
     bool                                          setCpuAffinity_;
     bool                                          continueAfterChildFailure_;
 
+    PreallocationConfiguration                    preallocations_;
+
     typedef std::set<std::pair<std::string, std::string> > ExcludedData;
     typedef std::map<std::string, ExcludedData> ExcludedDataMap;
     ExcludedDataMap                               eventSetupDataToExcludeFromPrefetching_;

diff --git a/FWCore/Framework/interface/Frameworkfwd.h b/FWCore/Framework/interface/Frameworkfwd.h
@@ -27,7 +27,6 @@ namespace edm {
   class LuminosityBlockPrincipal;
   class OutputModule;
   class OutputModuleDescription;
-  class OutputWorker;
   class ParameterSet;
   class Principal;
   class PrincipalCache;

diff --git a/FWCore/Framework/interface/OutputModule.h b/FWCore/Framework/interface/OutputModule.h
@@ -32,14 +32,19 @@ namespace edm {
 
   class ModuleCallingContext;
 
+  namespace maker {
+    template<typename T> class ModuleHolderT;
+  }
+
   typedef detail::TriggerResultsBasedEventSelector::handle_t Trig;
 
   class OutputModule : public EDConsumerBase {
   public:
+    template <typename T> friend class maker::ModuleHolderT;
     template <typename T> friend class WorkerT;
-    friend class ClassicOutputModuleCommunicator;
+    template <typename T> friend class OutputModuleCommunicatorT;
     typedef OutputModule ModuleType;
-    typedef OutputWorker WorkerType;
+    typedef WorkerT<OutputModule> WorkerType;
 
     explicit OutputModule(ParameterSet const& pset);
     virtual ~OutputModule();
@@ -82,6 +87,8 @@ namespace edm {
     Trig getTriggerResults(EventPrincipal const& ep, ModuleCallingContext const*) const;
 
     ModuleDescription const& description() const;
+    ModuleDescription const& moduleDescription() const { return moduleDescription_;
+    }
 
     ParameterSetID selectorConfig() const { return selector_config_id_; }
 
@@ -168,7 +175,7 @@ namespace edm {
     void doPreForkReleaseResources();
     void doPostForkReacquireResources(unsigned int iChildIndex, unsigned int iNumberOfChildren);
 
-    std::string workerType() const {return "OutputWorker";}
+    std::string workerType() const {return "WorkerT<OutputModule>";}
 
     /// Tell the OutputModule that is must end the current file.
     void doCloseFile();
@@ -216,9 +223,4 @@ namespace edm {
     bool limitReached() const {return remainingEvents_ == 0;}
   };
 }
-
-//this is included after the class definition since this header also needs to know about OutputModule
-// we put this here since all OutputModules need this header to create their plugin
-#include "FWCore/Framework/src/OutputWorker.h"
-
 #endif