Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Streamer output modules ported to one::OutputModule (76X) #11115

Merged

Conversation

smorovic
Copy link
Contributor

@smorovic smorovic commented Sep 3, 2015

Migrates EvFOutputModule (DAQ) and EventStreamFileWriter from legacy to one::OutputModule interface

…minosityBlocks> is needed to compile (in analogy to PoolOutputModule)

*streamer output module now also needs beginLumi and endLumi handlers
@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2015

A new Pull Request was created by @smorovic (Srecko Morovic) for CMSSW_7_6_X.

Streamer output modules ported to one::OutputModule (76X)

It involves the following packages:

EventFilter/Utilities
IOPool/Streamer

@smuzaffar, @Dr15Jones, @cvuosalo, @emeschi, @cmsbuild, @slava77, @mommsen can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @wddgit, @wmtan this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@cvuosalo
Copy link
Contributor

cvuosalo commented Sep 3, 2015

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2015

The tests are being triggered in jenkins.

@@ -44,8 +44,8 @@ namespace evf {
virtual void doOutputEvent(EventMsgBuilder const& msg) const;
//virtual void beginRun(edm::RunPrincipal const&, edm::ModuleCallingContext const*);
virtual void beginJob();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

override would be nice here as well.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2015

-1
Tested at: 1e5236a
I found an error when building:

>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-03-1100/src/DQMServices/StreamerIO/test/DQMStreamerOutputModule.cc 
>> Compiling edm plugin /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-03-1100/src/IOPool/Streamer/plugins/Module.cc 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-03-1100/src/IOPool/Streamer/bin/CalcAdler32.cpp 
>> Compiling  /tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-03-1100/src/IOPool/Streamer/bin/DiagStreamerFile.cpp 
/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-03-1100/src/DQMServices/StreamerIO/test/DQMStreamerOutputModule.cc: In constructor 'edm::DQMStreamerOutputModule::DQMStreamerOutputModule(const edm::ParameterSet&)':
/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-03-1100/src/DQMServices/StreamerIO/test/DQMStreamerOutputModule.cc:65:20: error: no matching function for call to 'edm::one::OutputModuleBase::OutputModuleBase()'
       currentRun_(0) {
                    ^
/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_7_6_X_2015-09-03-1100/src/DQMServices/StreamerIO/test/DQMStreamerOutputModule.cc:65:20: note: candidate is:
In file included from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc493/cms/cmssw-patch/CMSSW_7_6_X_2015-09-03-1100/src/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h:27:0,
                 from /afs/cern.ch/cms/sw/ReleaseCandidates/vol0/slc6_amd64_gcc493/cms/cmssw-patch/CMSSW_7_6_X_2015-09-03-1100/src/FWCore/Framework/interface/one/OutputModule.h:24,


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11115/7880/summary.html

@@ -55,7 +56,8 @@ namespace {

namespace edm {
StreamerOutputModuleBase::StreamerOutputModuleBase(ParameterSet const& ps) :
OutputModule(ps),
one::OutputModuleBase::OutputModuleBase(ps),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure either, but without it compiler complains at template instantiation because tries to use default constructor:

/home/smorovic/CMSSW/CMSSW_7_6_0_pre4/src/EventFilter/Utilities/plugins/RecoEventOutputModuleForFU.h:88:41: error: no matching function for call to 'edm::one::OutputModuleBase::OutputModuleBase()'
     outBuf_(new unsigned char[1024*1024])

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2015

Pull request #11115 was updated. @smuzaffar, @Dr15Jones, @cvuosalo, @emeschi, @cmsbuild, @deguio, @slava77, @mommsen, @danduggan can you please check and sign again.

@Dr15Jones
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 3, 2015

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2015

@cmsbuild
Copy link
Contributor

cmsbuild commented Sep 4, 2015

@Dr15Jones
Copy link
Contributor

+1

@fwyzard
Copy link
Contributor

fwyzard commented Sep 4, 2015

tracked at #10964

@cvuosalo
Copy link
Contributor

cvuosalo commented Sep 4, 2015

+1

For #11115 f235dac

Migrating streamer output modules to one::OutputModule to support multi-threading. There should be no change in monitored quantities.

The code changes are satisfactory, and Jenkins tests against baseline CMSSW_7_6_X_2015-09-03-1100 show no significant differences, as expected.

@deguio
Copy link
Contributor

deguio commented Sep 7, 2015

+1

davidlange6 added a commit that referenced this pull request Sep 8, 2015
Streamer output modules ported to one::OutputModule (76X)
@davidlange6 davidlange6 merged commit a6ee609 into cms-sw:CMSSW_7_6_X Sep 8, 2015
@smorovic smorovic deleted the one-StreamerOutputModule-76X branch November 13, 2015 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants