Merge pull request #1134 from Dr15Jones/streamModuleBeginStream

Multithreaded framework -- Changed beginStream of stream module to take StreamID
cms-sw · Oct 22, 2013 · a1731e8 · a1731e8
2 parents 83e563d + e24fc11
commit a1731e8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/FWCore/Framework/interface/stream/EDAnalyzerBase.h b/FWCore/Framework/interface/stream/EDAnalyzerBase.h
@@ -59,7 +59,7 @@ namespace edm {
 
       void registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegistry* reg);
 
-      virtual void beginStream() {}
+      virtual void beginStream(StreamID) {}
       virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
       virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual void analyze(Event const&, EventSetup const&) = 0;

diff --git a/FWCore/Framework/interface/stream/EDFilterBase.h b/FWCore/Framework/interface/stream/EDFilterBase.h
@@ -56,7 +56,7 @@ namespace edm {
 
       const EDFilterBase& operator=(const EDFilterBase&) = delete; // stop default
 
-      virtual void beginStream() {}
+      virtual void beginStream(StreamID) {}
       virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
       virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual bool filter(Event&, EventSetup const&) = 0;

diff --git a/FWCore/Framework/interface/stream/EDProducerBase.h b/FWCore/Framework/interface/stream/EDProducerBase.h
@@ -56,7 +56,7 @@ namespace edm {
 
       const EDProducerBase& operator=(const EDProducerBase&) = delete; // stop default
 
-      virtual void beginStream() {}
+      virtual void beginStream(StreamID) {}
       virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
       virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual void produce(Event&, EventSetup const&) = 0;

diff --git a/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc b/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
@@ -129,7 +129,7 @@ EDAnalyzerAdaptorBase::doBeginJob() {
 
 void
 EDAnalyzerAdaptorBase::doBeginStream(StreamID id) {
-  m_streamModules[id]->beginStream();
+  m_streamModules[id]->beginStream(id);
 }
 void
 EDAnalyzerAdaptorBase::doEndStream(StreamID id) {

diff --git a/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc b/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
@@ -121,7 +121,7 @@ namespace edm {
     template< typename T>
     void
     ProducingModuleAdaptorBase<T>::doBeginStream(StreamID id) {
-      m_streamModules[id]->beginStream();
+      m_streamModules[id]->beginStream(id);
     }
     template< typename T>
     void