Skip to content

Commit d170a9b

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47466 from makortel/moveToAbstractServices
Move `CPUServiceBase`, `RootHandlers`, and `TimingServiceBase` to `FWCore/AbstractServices`
2 parents 8655d7b + 3386c6b commit d170a9b

File tree

20 files changed

+68
-50
lines changed

20 files changed

+68
-50
lines changed

FWCore/Utilities/interface/CPUServiceBase.h renamed to FWCore/AbstractServices/interface/CPUServiceBase.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#ifndef FWCore_Utilities_CPUServiceBase_h
2-
#define FWCore_Utilities_CPUServiceBase_h
1+
#ifndef FWCore_AbstractServices_interface_CPUServiceBase_h
2+
#define FWCore_AbstractServices_interface_CPUServiceBase_h
33
// -*- C++ -*-
44
//
5-
// Package: FWCore/Utilities
5+
// Package: FWCore/AbstractServices
66
// Class : CPUServiceBase
77
//
88
/**\class edm::CPUServiceBase
@@ -23,8 +23,10 @@ namespace edm {
2323
class CPUServiceBase {
2424
public:
2525
CPUServiceBase();
26-
CPUServiceBase(const CPUServiceBase &) = delete; // stop default
27-
const CPUServiceBase &operator=(const CPUServiceBase &) = delete; // stop default
26+
CPUServiceBase(const CPUServiceBase &) = delete;
27+
const CPUServiceBase &operator=(const CPUServiceBase &) = delete;
28+
CPUServiceBase(CPUServiceBase &&) = delete;
29+
const CPUServiceBase &operator=(CPUServiceBase &&) = delete;
2830

2931
virtual ~CPUServiceBase();
3032
};

FWCore/Utilities/interface/RootHandlers.h renamed to FWCore/AbstractServices/interface/RootHandlers.h

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef FWCore_Utilities_RootHandlers_h
2-
#define FWCore_Utilities_RootHandlers_h
1+
#ifndef FWCore_AbstractServices_interface_RootHandlers_h
2+
#define FWCore_AbstractServices_interface_RootHandlers_h
33

44
#include "FWCore/Utilities/interface/propagate_const.h"
55
namespace edm {
@@ -20,7 +20,12 @@ namespace edm {
2020
friend class edm::EventProcessor;
2121

2222
public:
23-
virtual ~RootHandlers() {}
23+
RootHandlers() = default;
24+
RootHandlers(RootHandlers const&) = delete;
25+
RootHandlers& operator=(RootHandlers const&) = delete;
26+
RootHandlers(RootHandlers&&) = delete;
27+
RootHandlers& operator=(RootHandlers&&) = delete;
28+
virtual ~RootHandlers() = default;
2429

2530
template <typename F>
2631
void ignoreWarningsWhileDoing(F iFunc, SeverityLevel level = SeverityLevel::kWarning) {
@@ -36,4 +41,4 @@ namespace edm {
3641
};
3742
} // end of namespace edm
3843

39-
#endif // InitRootHandlers_H
44+
#endif

FWCore/Utilities/interface/TimingServiceBase.h renamed to FWCore/AbstractServices/interface/TimingServiceBase.h

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#ifndef FWCore_Utilities_TimingServiceBase_h
2-
#define FWCore_Utilities_TimingServiceBase_h
1+
#ifndef FWCore_AbstractServices_interface_TimingServiceBase_h
2+
#define FWCore_AbstractServices_interface_TimingServiceBase_h
33
// -*- C++ -*-
44
//
5-
// Package: FWCore/Utilities
5+
// Package: FWCore/AbstractServices
66
// Class : TimingServiceBase
77
//
88
/**\class TimingServiceBase TimingServiceBase.h "TimingServiceBase.h"
@@ -29,8 +29,10 @@ namespace edm {
2929
class TimingServiceBase {
3030
public:
3131
TimingServiceBase();
32-
TimingServiceBase(const TimingServiceBase&) = delete; // stop default
33-
const TimingServiceBase& operator=(const TimingServiceBase&) = delete; // stop default
32+
TimingServiceBase(const TimingServiceBase&) = delete;
33+
const TimingServiceBase& operator=(const TimingServiceBase&) = delete;
34+
TimingServiceBase(TimingServiceBase&&) = delete;
35+
const TimingServiceBase& operator=(TimingServiceBase&&) = delete;
3436
virtual ~TimingServiceBase();
3537

3638
// ---------- member functions ---------------------------

‎FWCore/AbstractServices/src/CPUServiceBase.cc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// -*- C++ -*-
2+
//
3+
// Package: FWCore/AbstractServices
4+
// Class : CPUServiceBase
5+
//
6+
// Implementation:
7+
// Stub class information for CPU service.
8+
//
9+
// Original Author: Brian Bockelman
10+
// Created: Wed Sep 7 12:05:13 CDT 2016
11+
//
12+
13+
#include "FWCore/AbstractServices/interface/CPUServiceBase.h"
14+
15+
namespace edm {
16+
CPUServiceBase::CPUServiceBase() = default;
17+
CPUServiceBase::~CPUServiceBase() = default;
18+
} // namespace edm

FWCore/Utilities/src/TimingServiceBase.cc renamed to FWCore/AbstractServices/src/TimingServiceBase.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- C++ -*-
22
//
3-
// Package: Subsystem/Package
3+
// Package: FWCore/AbstractServices
44
// Class : TimingServiceBase
55
//
66
// Implementation:
@@ -15,7 +15,7 @@
1515
#include <sys/time.h>
1616

1717
// user include files
18-
#include "FWCore/Utilities/interface/TimingServiceBase.h"
18+
#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
1919

2020
using namespace edm;
2121
//
@@ -32,6 +32,6 @@ void TimingServiceBase::jobStarted() {
3232
//
3333
// constructors and destructor
3434
//
35-
TimingServiceBase::TimingServiceBase() {}
35+
TimingServiceBase::TimingServiceBase() = default;
3636

37-
TimingServiceBase::~TimingServiceBase() {}
37+
TimingServiceBase::~TimingServiceBase() = default;

‎FWCore/Framework/bin/BuildFile.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<use name="tbb"/>
44
<use name="boost"/>
55
<use name="boost_program_options"/>
6+
<use name="FWCore/AbstractServices"/>
67
<use name="FWCore/Framework"/>
78
<use name="FWCore/MessageLogger"/>
89
<use name="FWCore/PluginManager"/>
@@ -17,6 +18,7 @@
1718
<use name="boost"/>
1819
<use name="boost_program_options"/>
1920
<use name="tcmalloc_minimal"/>
21+
<use name="FWCore/AbstractServices"/>
2022
<use name="FWCore/Framework"/>
2123
<use name="FWCore/MessageLogger"/>
2224
<use name="FWCore/PluginManager"/>
@@ -31,6 +33,7 @@
3133
<use name="boost"/>
3234
<use name="boost_program_options"/>
3335
<use name="jemalloc"/>
36+
<use name="FWCore/AbstractServices"/>
3437
<use name="FWCore/Framework"/>
3538
<use name="FWCore/MessageLogger"/>
3639
<use name="FWCore/PluginManager"/>
@@ -46,6 +49,7 @@
4649
<use name="boost"/>
4750
<use name="boost_program_options"/>
4851
<use name="jemalloc"/>
52+
<use name="FWCore/AbstractServices"/>
4953
<use name="FWCore/Framework"/>
5054
<use name="FWCore/MessageLogger"/>
5155
<use name="FWCore/PluginManager"/>
@@ -60,6 +64,7 @@
6064
<use name="boost"/>
6165
<use name="boost_program_options"/>
6266
<use name="jemalloc"/>
67+
<use name="FWCore/AbstractServices"/>
6368
<use name="FWCore/Framework"/>
6469
<use name="FWCore/MessageLogger"/>
6570
<use name="FWCore/PluginManager"/>
@@ -74,6 +79,7 @@
7479
<use name="boost"/>
7580
<use name="boost_program_options"/>
7681
<use name="gperf_tcmalloc_and_profiler"/>
82+
<use name="FWCore/AbstractServices"/>
7783
<use name="FWCore/Framework"/>
7884
<use name="FWCore/MessageLogger"/>
7985
<use name="FWCore/PluginManager"/>
@@ -88,6 +94,7 @@
8894
<use name="boost"/>
8995
<use name="boost_program_options"/>
9096
<use name="jemalloc-prof"/>
97+
<use name="FWCore/AbstractServices"/>
9198
<use name="FWCore/Framework"/>
9299
<use name="FWCore/MessageLogger"/>
93100
<use name="FWCore/PluginManager"/>

‎FWCore/Framework/bin/cmsRun.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ This is a generic main that can be used with any plugin and a
33
PSet script. See notes in EventProcessor.cpp for details about it.
44
----------------------------------------------------------------------*/
55

6+
#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
67
#include "FWCore/Framework/interface/CmsRunParser.h"
78
#include "FWCore/Framework/interface/EventProcessor.h"
89
#include "FWCore/Framework/interface/defaultCmsRunServices.h"
@@ -26,7 +27,6 @@ PSet script. See notes in EventProcessor.cpp for details about it.
2627
#include "FWCore/Utilities/interface/EDMException.h"
2728
#include "FWCore/Utilities/interface/ConvertException.h"
2829
#include "FWCore/Utilities/interface/Presence.h"
29-
#include "FWCore/Utilities/interface/TimingServiceBase.h"
3030
#include "FWCore/Utilities/interface/thread_safety_macros.h"
3131

3232
#include "TError.h"

‎FWCore/Framework/src/EventProcessor.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
#include "FWCore/ParameterSet/interface/Registry.h"
5656
#include "FWCore/ParameterSet/interface/validateTopLevelParameterSets.h"
5757

58+
#include "FWCore/AbstractServices/interface/RootHandlers.h"
59+
5860
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
5961
#include "FWCore/ServiceRegistry/interface/Service.h"
6062
#include "FWCore/ServiceRegistry/interface/StreamContext.h"
@@ -74,7 +76,6 @@
7476
#include "FWCore/Utilities/interface/UnixSignalHandlers.h"
7577
#include "FWCore/Utilities/interface/ExceptionCollector.h"
7678
#include "FWCore/Utilities/interface/StreamID.h"
77-
#include "FWCore/Utilities/interface/RootHandlers.h"
7879
#include "FWCore/Utilities/interface/propagate_const.h"
7980
#include "FWCore/Utilities/interface/thread_safety_macros.h"
8081

‎FWCore/Services/plugins/CPU.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// Original Author: Natalia Garcia
99
// CPU.cc: v 1.0 2009/01/08 11:31:07
1010

11+
#include "FWCore/AbstractServices/interface/CPUServiceBase.h"
1112
#include "FWCore/AbstractServices/interface/ResourceInformation.h"
1213
#include "FWCore/MessageLogger/interface/JobReport.h"
1314
#include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -16,7 +17,6 @@
1617
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1718
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
1819
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
19-
#include "FWCore/Utilities/interface/CPUServiceBase.h"
2020

2121
#include "cpu_features/cpu_features_macros.h"
2222

‎FWCore/Services/plugins/CondorStatusUpdater.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include "DataFormats/Provenance/interface/ModuleDescription.h"
33
#include "DataFormats/Provenance/interface/ParameterSetID.h"
44
#include "FWCore/AbstractServices/interface/ResourceInformation.h"
5+
#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
56
#include "FWCore/MessageLogger/interface/MessageLogger.h"
6-
#include "FWCore/Utilities/interface/TimingServiceBase.h"
77
#include "FWCore/ServiceRegistry/interface/Service.h"
88
#include "FWCore/ServiceRegistry/interface/ProcessContext.h"
99
#include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"

0 commit comments

Comments
 (0)