Merge pull request #47466 from makortel/moveToAbstractServices

cmsbuild · web-flow · commit d170a9b7206b · 2025-03-06T09:30:22.000+01:00
Move `CPUServiceBase`, `RootHandlers`, and `TimingServiceBase` to `FWCore/AbstractServices`
diff --git a/FWCore/AbstractServices/interface/CPUServiceBase.h b/FWCore/AbstractServices/interface/CPUServiceBase.h
@@ -1,8 +1,8 @@
-#ifndef FWCore_Utilities_CPUServiceBase_h
-#define FWCore_Utilities_CPUServiceBase_h
+#ifndef FWCore_AbstractServices_interface_CPUServiceBase_h
+#define FWCore_AbstractServices_interface_CPUServiceBase_h
 // -*- C++ -*-
 //
-// Package:     FWCore/Utilities
+// Package:     FWCore/AbstractServices
 // Class  :     CPUServiceBase
 //
 /**\class edm::CPUServiceBase
@@ -23,8 +23,10 @@ namespace edm {
   class CPUServiceBase {
   public:
     CPUServiceBase();
-    CPUServiceBase(const CPUServiceBase &) = delete;                   // stop default
-    const CPUServiceBase &operator=(const CPUServiceBase &) = delete;  // stop default
+    CPUServiceBase(const CPUServiceBase &) = delete;
+    const CPUServiceBase &operator=(const CPUServiceBase &) = delete;
+    CPUServiceBase(CPUServiceBase &&) = delete;
+    const CPUServiceBase &operator=(CPUServiceBase &&) = delete;
 
     virtual ~CPUServiceBase();
   };
diff --git a/FWCore/AbstractServices/interface/RootHandlers.h b/FWCore/AbstractServices/interface/RootHandlers.h
@@ -1,5 +1,5 @@
-#ifndef FWCore_Utilities_RootHandlers_h
-#define FWCore_Utilities_RootHandlers_h
+#ifndef FWCore_AbstractServices_interface_RootHandlers_h
+#define FWCore_AbstractServices_interface_RootHandlers_h
 
 #include "FWCore/Utilities/interface/propagate_const.h"
 namespace edm {
@@ -20,7 +20,12 @@ namespace edm {
     friend class edm::EventProcessor;
 
   public:
-    virtual ~RootHandlers() {}
+    RootHandlers() = default;
+    RootHandlers(RootHandlers const&) = delete;
+    RootHandlers& operator=(RootHandlers const&) = delete;
+    RootHandlers(RootHandlers&&) = delete;
+    RootHandlers& operator=(RootHandlers&&) = delete;
+    virtual ~RootHandlers() = default;
 
     template <typename F>
     void ignoreWarningsWhileDoing(F iFunc, SeverityLevel level = SeverityLevel::kWarning) {
@@ -36,4 +41,4 @@ namespace edm {
   };
 }  // end of namespace edm
 
-#endif  // InitRootHandlers_H
+#endif
diff --git a/FWCore/AbstractServices/interface/TimingServiceBase.h b/FWCore/AbstractServices/interface/TimingServiceBase.h
@@ -1,8 +1,8 @@
-#ifndef FWCore_Utilities_TimingServiceBase_h
-#define FWCore_Utilities_TimingServiceBase_h
+#ifndef FWCore_AbstractServices_interface_TimingServiceBase_h
+#define FWCore_AbstractServices_interface_TimingServiceBase_h
 // -*- C++ -*-
 //
-// Package:     FWCore/Utilities
+// Package:     FWCore/AbstractServices
 // Class  :     TimingServiceBase
 //
 /**\class TimingServiceBase TimingServiceBase.h "TimingServiceBase.h"
@@ -29,8 +29,10 @@ namespace edm {
   class TimingServiceBase {
   public:
     TimingServiceBase();
-    TimingServiceBase(const TimingServiceBase&) = delete;                   // stop default
-    const TimingServiceBase& operator=(const TimingServiceBase&) = delete;  // stop default
+    TimingServiceBase(const TimingServiceBase&) = delete;
+    const TimingServiceBase& operator=(const TimingServiceBase&) = delete;
+    TimingServiceBase(TimingServiceBase&&) = delete;
+    const TimingServiceBase& operator=(TimingServiceBase&&) = delete;
     virtual ~TimingServiceBase();
 
     // ---------- member functions ---------------------------
diff --git a/FWCore/AbstractServices/src/CPUServiceBase.cc b/FWCore/AbstractServices/src/CPUServiceBase.cc
@@ -0,0 +1,18 @@
+// -*- C++ -*-
+//
+// Package:     FWCore/AbstractServices
+// Class  :     CPUServiceBase
+//
+// Implementation:
+//     Stub class information for CPU service.
+//
+// Original Author:  Brian Bockelman
+//         Created:  Wed Sep  7 12:05:13 CDT 2016
+//
+
+#include "FWCore/AbstractServices/interface/CPUServiceBase.h"
+
+namespace edm {
+  CPUServiceBase::CPUServiceBase() = default;
+  CPUServiceBase::~CPUServiceBase() = default;
+}  // namespace edm
diff --git a/FWCore/AbstractServices/src/TimingServiceBase.cc b/FWCore/AbstractServices/src/TimingServiceBase.cc
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// Package:     Subsystem/Package
+// Package:     FWCore/AbstractServices
 // Class  :     TimingServiceBase
 //
 // Implementation:
@@ -15,7 +15,7 @@
 #include <sys/time.h>
 
 // user include files
-#include "FWCore/Utilities/interface/TimingServiceBase.h"
+#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
 
 using namespace edm;
 //
@@ -32,6 +32,6 @@ void TimingServiceBase::jobStarted() {
 //
 // constructors and destructor
 //
-TimingServiceBase::TimingServiceBase() {}
+TimingServiceBase::TimingServiceBase() = default;
 
-TimingServiceBase::~TimingServiceBase() {}
+TimingServiceBase::~TimingServiceBase() = default;
diff --git a/FWCore/Framework/bin/BuildFile.xml b/FWCore/Framework/bin/BuildFile.xml
@@ -3,6 +3,7 @@
   <use name="tbb"/>
   <use name="boost"/>
   <use name="boost_program_options"/>
+  <use name="FWCore/AbstractServices"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/PluginManager"/>
@@ -17,6 +18,7 @@
   <use name="boost"/>
   <use name="boost_program_options"/>
   <use name="tcmalloc_minimal"/>
+  <use name="FWCore/AbstractServices"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/PluginManager"/>
@@ -31,6 +33,7 @@
   <use name="boost"/>
   <use name="boost_program_options"/>
   <use name="jemalloc"/>
+  <use name="FWCore/AbstractServices"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/PluginManager"/>
@@ -46,6 +49,7 @@
   <use name="boost"/>
   <use name="boost_program_options"/>
   <use name="jemalloc"/>
+  <use name="FWCore/AbstractServices"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/PluginManager"/>
@@ -60,6 +64,7 @@
   <use name="boost"/>
   <use name="boost_program_options"/>
   <use name="jemalloc"/>
+  <use name="FWCore/AbstractServices"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/PluginManager"/>
@@ -74,6 +79,7 @@
   <use name="boost"/>
   <use name="boost_program_options"/>
   <use name="gperf_tcmalloc_and_profiler"/>
+  <use name="FWCore/AbstractServices"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/PluginManager"/>
@@ -88,6 +94,7 @@
   <use name="boost"/>
   <use name="boost_program_options"/>
   <use name="jemalloc-prof"/>
+  <use name="FWCore/AbstractServices"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/PluginManager"/>
diff --git a/FWCore/Framework/bin/cmsRun.cpp b/FWCore/Framework/bin/cmsRun.cpp
@@ -3,6 +3,7 @@ This is a generic main that can be used with any plugin and a
 PSet script.   See notes in EventProcessor.cpp for details about it.
 ----------------------------------------------------------------------*/
 
+#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
 #include "FWCore/Framework/interface/CmsRunParser.h"
 #include "FWCore/Framework/interface/EventProcessor.h"
 #include "FWCore/Framework/interface/defaultCmsRunServices.h"
@@ -26,7 +27,6 @@ PSet script.   See notes in EventProcessor.cpp for details about it.
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/ConvertException.h"
 #include "FWCore/Utilities/interface/Presence.h"
-#include "FWCore/Utilities/interface/TimingServiceBase.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 
 #include "TError.h"
diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
@@ -55,6 +55,8 @@
 #include "FWCore/ParameterSet/interface/Registry.h"
 #include "FWCore/ParameterSet/interface/validateTopLevelParameterSets.h"
 
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
+
 #include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ServiceRegistry/interface/StreamContext.h"
@@ -74,7 +76,6 @@
 #include "FWCore/Utilities/interface/UnixSignalHandlers.h"
 #include "FWCore/Utilities/interface/ExceptionCollector.h"
 #include "FWCore/Utilities/interface/StreamID.h"
-#include "FWCore/Utilities/interface/RootHandlers.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 
diff --git a/FWCore/Services/plugins/CPU.cc b/FWCore/Services/plugins/CPU.cc
@@ -8,6 +8,7 @@
 // Original Author:  Natalia Garcia
 // CPU.cc: v 1.0 2009/01/08 11:31:07
 
+#include "FWCore/AbstractServices/interface/CPUServiceBase.h"
 #include "FWCore/AbstractServices/interface/ResourceInformation.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -16,7 +17,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "FWCore/Utilities/interface/CPUServiceBase.h"
 
 #include "cpu_features/cpu_features_macros.h"
 
diff --git a/FWCore/Services/plugins/CondorStatusUpdater.cc b/FWCore/Services/plugins/CondorStatusUpdater.cc
@@ -2,8 +2,8 @@
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "DataFormats/Provenance/interface/ParameterSetID.h"
 #include "FWCore/AbstractServices/interface/ResourceInformation.h"
+#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/TimingServiceBase.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ServiceRegistry/interface/ProcessContext.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
diff --git a/FWCore/Services/plugins/InitRootHandlers.cc b/FWCore/Services/plugins/InitRootHandlers.cc
@@ -1,4 +1,4 @@
-#include "FWCore/Utilities/interface/RootHandlers.h"
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
 
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/ServiceRegistry/interface/SystemBounds.h"
diff --git a/FWCore/Services/plugins/Timing.cc b/FWCore/Services/plugins/Timing.cc
@@ -8,10 +8,8 @@
 // Original Author:  Jim Kowalkowski
 //
 
-#include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
-
-#include "FWCore/Utilities/interface/TimingServiceBase.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
+#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
@@ -20,6 +18,7 @@
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/ServiceRegistry/interface/GlobalContext.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 #include "FWCore/ServiceRegistry/interface/StreamContext.h"
 #include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"
 #include "FWCore/ServiceRegistry/interface/ESModuleCallingContext.h"
diff --git a/FWCore/Services/plugins/tracer_setupFile.cc b/FWCore/Services/plugins/tracer_setupFile.cc
@@ -27,7 +27,7 @@
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 #include "FWCore/Framework/interface/ESRecordsToProductResolverIndices.h"
 
-#include "FWCore/Utilities/interface/TimingServiceBase.h"
+#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
 
 using namespace edm::service::monitor_file_utilities;
 
diff --git a/FWCore/Utilities/src/CPUServiceBase.cc b/FWCore/Utilities/src/CPUServiceBase.cc
diff --git a/IOPool/Common/BuildFile.xml b/IOPool/Common/BuildFile.xml
@@ -1,3 +1,4 @@
+<use name="FWCore/AbstractServices"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <export>
diff --git a/IOPool/Common/src/RootServiceChecker.cc b/IOPool/Common/src/RootServiceChecker.cc
@@ -1,7 +1,7 @@
 #include "IOPool/Common/interface/RootServiceChecker.h"
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/EDMException.h"
-#include "FWCore/Utilities/interface/RootHandlers.h"
 
 namespace edm {
   RootServiceChecker::RootServiceChecker() {
diff --git a/IOPool/Output/BuildFile.xml b/IOPool/Output/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="tbb"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
+<use name="FWCore/AbstractServices"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
diff --git a/IOPool/Output/src/RootOutputTree.cc b/IOPool/Output/src/RootOutputTree.cc
@@ -3,12 +3,12 @@
 
 #include "DataFormats/Common/interface/RefCoreStreamer.h"
 #include "DataFormats/Provenance/interface/ProductDescription.h"
+#include "FWCore/AbstractServices/interface/RootHandlers.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/EDMException.h"
-#include "FWCore/Utilities/interface/RootHandlers.h"
 #include "FWCore/Catalog/interface/SiteLocalConfig.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
diff --git a/PerfTools/AllocMonitor/plugins/BuildFile.xml b/PerfTools/AllocMonitor/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
+<use name="FWCore/AbstractServices"/>
+<use name="FWCore/Concurrency"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="PerfTools/AllocMonitor"/>
-<use name="FWCore/Concurrency"/>
diff --git a/PerfTools/AllocMonitor/plugins/moduleAlloc_setupFile.cc b/PerfTools/AllocMonitor/plugins/moduleAlloc_setupFile.cc
@@ -27,7 +27,7 @@
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 #include "FWCore/Framework/interface/ESRecordsToProductResolverIndices.h"
 
-#include "FWCore/Utilities/interface/TimingServiceBase.h"
+#include "FWCore/AbstractServices/interface/TimingServiceBase.h"
 
 #include "ThreadAllocInfo.h"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "FWCore/Utilities/interface/RootHandlers.h"`
	`1`	`+#include "FWCore/AbstractServices/interface/RootHandlers.h"`
`2`	`2`
`3`	`3`	`#include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"`
`4`	`4`	`#include "FWCore/ServiceRegistry/interface/SystemBounds.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<use name="FWCore/AbstractServices"/>`
`1`	`2`	`<use name="FWCore/ServiceRegistry"/>`
`2`	`3`	`<use name="FWCore/Utilities"/>`
`3`	`4`	`<export>`