Skip to content

Commit

Permalink
TriggerResultsInserter handled like PathResultsInserter
Browse files Browse the repository at this point in the history 
Called via runModuleDirectly instead of doWork.
  • Loading branch information
@Dr15Jones
Dr15Jones committed Jan 5, 2021
1 parent c7f2790 commit 64f110e
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 205 deletions.
5 changes: 4 additions & 1 deletion FWCore/Framework/src/StreamSchedule.cc
View file
Expand Up @@ -696,7 +696,10 @@ namespace edm {
ParentContext parentContext(&streamContext_);
using Traits = OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>;

results_inserter_->doWork<Traits>(info, streamID_, parentContext, &streamContext_);
auto expt = results_inserter_->runModuleDirectly<Traits>(info, streamID_, parentContext, &streamContext_);
if (expt) {
std::rethrow_exception(expt);
}
} catch (cms::Exception& ex) {
if (not iExcept) {
if (ex.context().empty()) {
Expand Down
6 changes: 0 additions & 6 deletions FWCore/Framework/test/unit_test_outputs/test_deepCall_unscheduled.log
View file
Expand Up @@ -244,8 +244,6 @@ ModuleCallingContext state = Running
++++++++ starting: processing event for module: stream = 0 label = 'p' id = 2
++++++++ finished: processing event for module: stream = 0 label = 'p' id = 2
++++++ finished: processing path 'p' : stream = 0
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++ finished: processing event : stream = 0 run = 1 lumi = 1 event = 1 time = 1000010
Expand Down Expand Up @@ -360,8 +358,6 @@ ModuleCallingContext state = Running
++++++++ starting: processing event for module: stream = 0 label = 'p' id = 2
++++++++ finished: processing event for module: stream = 0 label = 'p' id = 2
++++++ finished: processing path 'p' : stream = 0
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++ finished: processing event : stream = 0 run = 1 lumi = 1 event = 2 time = 1000020
Expand Down Expand Up @@ -476,8 +472,6 @@ ModuleCallingContext state = Running
++++++++ starting: processing event for module: stream = 0 label = 'p' id = 2
++++++++ finished: processing event for module: stream = 0 label = 'p' id = 2
++++++ finished: processing path 'p' : stream = 0
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++ finished: processing event : stream = 0 run = 1 lumi = 1 event = 3 time = 1000030
Expand Down
6 changes: 0 additions & 6 deletions FWCore/Framework/test/unit_test_outputs/test_onPath_unscheduled.log
View file
Expand Up @@ -84,8 +84,6 @@
++++++++ starting: processing event for module: stream = 0 label = 'p' id = 2
++++++++ finished: processing event for module: stream = 0 label = 'p' id = 2
++++++ finished: processing path 'p' : stream = 0
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++ finished: processing event : stream = 0 run = 1 lumi = 1 event = 1 time = 1000010
Expand All @@ -112,8 +110,6 @@
++++++++ starting: processing event for module: stream = 0 label = 'p' id = 2
++++++++ finished: processing event for module: stream = 0 label = 'p' id = 2
++++++ finished: processing path 'p' : stream = 0
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++ finished: processing event : stream = 0 run = 1 lumi = 1 event = 2 time = 1000020
Expand All @@ -140,8 +136,6 @@
++++++++ starting: processing event for module: stream = 0 label = 'p' id = 2
++++++++ finished: processing event for module: stream = 0 label = 'p' id = 2
++++++ finished: processing path 'p' : stream = 0
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++ finished: processing event : stream = 0 run = 1 lumi = 1 event = 3 time = 1000030
Expand Down
6 changes: 0 additions & 6 deletions FWCore/Integration/test/unit_test_outputs/testGetBy1.log
View file
Expand Up @@ -603,8 +603,6 @@ PathContext: pathName = p pathID = 0
runIndex = 0 luminosityBlockIndex = 0 unixTime = 0 microsecondOffset = 5000001
ProcessContext: PROD1 be16549dc0c1f4b03231a8b98d235dac

++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'out' id = 8
Expand Down Expand Up @@ -831,8 +829,6 @@ PathContext: pathName = p pathID = 0
runIndex = 0 luminosityBlockIndex = 0 unixTime = 0 microsecondOffset = 10000001
ProcessContext: PROD1 be16549dc0c1f4b03231a8b98d235dac

++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'out' id = 8
Expand Down Expand Up @@ -1059,8 +1055,6 @@ PathContext: pathName = p pathID = 0
runIndex = 0 luminosityBlockIndex = 0 unixTime = 0 microsecondOffset = 15000001
ProcessContext: PROD1 be16549dc0c1f4b03231a8b98d235dac

++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'out' id = 8
Expand Down
6 changes: 0 additions & 6 deletions FWCore/Integration/test/unit_test_outputs/testGetBy2.log
View file
Expand Up @@ -294,8 +294,6 @@ PathContext: pathName = p pathID = 0
runIndex = 0 luminosityBlockIndex = 0 unixTime = 0 microsecondOffset = 5000001
ProcessContext: PROD2 7da3661f4f7dead5e42f07cf3ddf5a59

++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'out' id = 5
Expand Down Expand Up @@ -444,8 +442,6 @@ PathContext: pathName = p pathID = 0
runIndex = 0 luminosityBlockIndex = 0 unixTime = 0 microsecondOffset = 10000001
ProcessContext: PROD2 7da3661f4f7dead5e42f07cf3ddf5a59

++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'out' id = 5
Expand Down Expand Up @@ -594,8 +590,6 @@ PathContext: pathName = p pathID = 0
runIndex = 0 luminosityBlockIndex = 0 unixTime = 0 microsecondOffset = 15000001
ProcessContext: PROD2 7da3661f4f7dead5e42f07cf3ddf5a59

++++++++ starting: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: prefetching before processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ finished: processing event for module: stream = 0 label = 'TriggerResults' id = 1
++++++++ starting: prefetching before processing event for module: stream = 0 label = 'out' id = 5
Expand Down

0 comments on commit 64f110e

Please sign in to comment.