Skip to content

Commit 6eacf8c

Browse files
authored
Merge pull request #47467 from wddgit/properSignalForPathsAndConsumes
Access PathsAndConsumesOfModules from new signal
2 parents aedbfcc + 634b7fd commit 6eacf8c

File tree

33 files changed

+71
-101
lines changed

33 files changed

+71
-101
lines changed

EventFilter/Utilities/interface/EvFDaqDirector.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class GlobalContext;
3737
class StreamID;
3838

3939
namespace edm {
40-
class PathsAndConsumesOfModulesBase;
4140
class ProcessContext;
4241
} // namespace edm
4342

EventFilter/Utilities/interface/FastMonitoringService.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
#include <filesystem>
1515

16-
#include "EventFilter/Utilities/interface/FastMonitoringService.h"
17-
1816
#include <string>
1917
#include <vector>
2018
#include <map>
@@ -181,7 +179,7 @@ namespace evf {
181179

182180
void preallocate(edm::service::SystemBounds const&);
183181
void jobFailure();
184-
void preBeginJob(edm::PathsAndConsumesOfModulesBase const&, edm::ProcessContext const& pc);
182+
void preBeginJob(edm::ProcessContext const& pc);
185183

186184
void preModuleBeginJob(edm::ModuleDescription const&);
187185
void postBeginJob();

EventFilter/Utilities/src/FastMonitoringService.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "FWCore/Utilities/interface/UnixSignalHandlers.h"
1616

1717
#include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"
18-
#include "FWCore/ServiceRegistry/interface/PathsAndConsumesOfModulesBase.h"
1918
#include "DataFormats/Provenance/interface/ModuleDescription.h"
2019

2120
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
@@ -318,7 +317,7 @@ namespace evf {
318317
//start concurrency tracking
319318
}
320319

321-
void FastMonitoringService::preBeginJob(edm::PathsAndConsumesOfModulesBase const&, edm::ProcessContext const& pc) {
320+
void FastMonitoringService::preBeginJob(edm::ProcessContext const& pc) {
322321
// FIND RUN DIRECTORY
323322
// The run dir should be set via the configuration of EvFDaqDirector
324323
if (tbbConcurrencyTracker_)

FWCore/Framework/interface/GlobalSchedule.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ namespace edm {
7777
void beginJob(ProductRegistry const&,
7878
eventsetup::ESRecordsToProductResolverIndices const&,
7979
ProcessBlockHelperBase const&,
80-
PathsAndConsumesOfModulesBase const&,
8180
ProcessContext const&);
8281
void endJob(ExceptionCollector& collector);
8382

FWCore/Framework/interface/Schedule.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ namespace edm {
174174
void beginJob(ProductRegistry const&,
175175
eventsetup::ESRecordsToProductResolverIndices const&,
176176
ProcessBlockHelperBase const&,
177-
PathsAndConsumesOfModulesBase const&,
178177
ProcessContext const&);
179178
void endJob(ExceptionCollector& collector);
180179
void sendFwkSummaryToMessageLogger() const;

FWCore/Framework/src/EventProcessor.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -748,8 +748,7 @@ namespace edm {
748748
// after they all complete.
749749
std::exception_ptr firstException;
750750
CMS_SA_ALLOW try {
751-
schedule_->beginJob(
752-
*preg_, esRecordsToProductResolverIndices, *processBlockHelper_, pathsAndConsumesOfModules, processContext_);
751+
schedule_->beginJob(*preg_, esRecordsToProductResolverIndices, *processBlockHelper_, processContext_);
753752
} catch (...) {
754753
firstException = std::current_exception();
755754
}

FWCore/Framework/src/GlobalSchedule.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ namespace edm {
9898
void GlobalSchedule::beginJob(ProductRegistry const& iRegistry,
9999
eventsetup::ESRecordsToProductResolverIndices const& iESIndices,
100100
ProcessBlockHelperBase const& processBlockHelperBase,
101-
PathsAndConsumesOfModulesBase const& pathsAndConsumesOfModules,
102101
ProcessContext const& processContext) {
103102
GlobalContext globalContext(GlobalContext::Transition::kBeginJob, processContext_);
104103
unsigned int const managerIndex =
@@ -107,9 +106,7 @@ namespace edm {
107106
std::exception_ptr exceptionPtr;
108107
CMS_SA_ALLOW try {
109108
try {
110-
convertException::wrap([this, &pathsAndConsumesOfModules, &processContext]() {
111-
actReg_->preBeginJobSignal_(pathsAndConsumesOfModules, processContext);
112-
});
109+
convertException::wrap([this, &processContext]() { actReg_->preBeginJobSignal_(processContext); });
113110
} catch (cms::Exception& ex) {
114111
exceptionContext(ex, globalContext, "Handling pre signal, likely in a service function");
115112
throw;

FWCore/Framework/src/Schedule.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,9 +1191,8 @@ namespace edm {
11911191
void Schedule::beginJob(ProductRegistry const& iRegistry,
11921192
eventsetup::ESRecordsToProductResolverIndices const& iESIndices,
11931193
ProcessBlockHelperBase const& processBlockHelperBase,
1194-
PathsAndConsumesOfModulesBase const& pathsAndConsumesOfModules,
11951194
ProcessContext const& processContext) {
1196-
globalSchedule_->beginJob(iRegistry, iESIndices, processBlockHelperBase, pathsAndConsumesOfModules, processContext);
1195+
globalSchedule_->beginJob(iRegistry, iESIndices, processBlockHelperBase, processContext);
11971196
}
11981197

11991198
void Schedule::beginStream(unsigned int streamID) {

FWCore/Framework/src/SubProcess.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,7 @@ namespace edm {
332332

333333
std::exception_ptr firstException;
334334
CMS_SA_ALLOW try {
335-
schedule_->beginJob(
336-
*preg_, esp_->recordsToResolverIndices(), *processBlockHelper_, *pathsAndConsumesOfModules_, processContext_);
335+
schedule_->beginJob(*preg_, esp_->recordsToResolverIndices(), *processBlockHelper_, processContext_);
337336
} catch (...) {
338337
firstException = std::current_exception();
339338
}

FWCore/Integration/plugins/PathsAndConsumesOfModulesTestService.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ namespace edmtest {
1414
public:
1515
PathsAndConsumesOfModulesTestService(edm::ParameterSet const& pset, edm::ActivityRegistry& iRegistry)
1616
: modulesConsumes_(pset.getParameter<decltype(modulesConsumes_)>("modulesAndConsumes")) {
17-
iRegistry.watchPreBeginJob(this, &PathsAndConsumesOfModulesTestService::preBeginJob);
17+
iRegistry.watchLookupInitializationComplete(this,
18+
&PathsAndConsumesOfModulesTestService::lookupInitializationComplete);
1819
}
1920

2021
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
@@ -29,7 +30,8 @@ namespace edmtest {
2930
descriptions.setComment("This service is intended to be used in framework tests.");
3031
}
3132

32-
void preBeginJob(edm::PathsAndConsumesOfModulesBase const& pathsAndConsumes, edm::ProcessContext const&) const {
33+
void lookupInitializationComplete(edm::PathsAndConsumesOfModulesBase const& pathsAndConsumes,
34+
edm::ProcessContext const&) const {
3335
auto const& allModules = pathsAndConsumes.allModules();
3436
for (auto const& moduleToCheck : modulesConsumes_) {
3537
auto found =

0 commit comments

Comments
 (0)