Move TimingServiceBase class to FWCore/AbstractServices

Author: makortel

…/Utilities/interface/TimingServiceBase.h …ctServices/interface/TimingServiceBase.hFWCore/Utilities/interface/TimingServiceBase.h renamed to FWCore/AbstractServices/interface/TimingServiceBase.h FWCore/Utilities/interface/TimingServiceBase.h renamed to 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 ---------------------------

FWCore/Utilities/src/TimingServiceBase.cc …bstractServices/src/TimingServiceBase.ccFWCore/Utilities/src/TimingServiceBase.cc renamed to FWCore/AbstractServices/src/TimingServiceBase.cc FWCore/Utilities/src/TimingServiceBase.cc renamed to 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;

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"/>

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"

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"

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"

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;
 

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"/>

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"