now use CPUTimer instead of TStopwatch

cms-sw · Apr 19, 2006 · e16e382 · e16e382
1 parent e3c675c
commit e16e382
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 26 deletions.
diff --git a/FWCore/Framework/BuildFile b/FWCore/Framework/BuildFile
@@ -1,5 +1,4 @@
 <use name=boost>
-<use name=rootcore>
 <use name=DataFormats/Common>
 <use name=FileCatalog>
 <use name=FWCore/ParameterSet>
@@ -9,7 +8,6 @@
 <export>
  <lib name=FWCoreFramework>
  <use name=boost>
- <use name=rootcore>
  <use name=DataFormats/Common>
  <use name=FileCatalog>
  <use name=FWCore/ParameterSet>

diff --git a/FWCore/Framework/interface/Schedule.h b/FWCore/Framework/interface/Schedule.h
@@ -4,7 +4,7 @@
 /*
   Author: Jim Kowalkowski  28-01-06
 
-  $Id: Schedule.h,v 1.6 2006/04/04 16:55:36 lsexton Exp $
+  $Id: Schedule.h,v 1.7 2006/04/10 22:35:43 jbk Exp $
 
   A class for creating a schedule based on paths in the configuration file.
   The schedule is maintained as a sequence of paths.
@@ -142,7 +142,7 @@ namespace edm
     void endJob();
 
     std::pair<double,double> timeCpuReal() const {
-      return std::pair<double,double>(stopwatch_->CpuTime(),stopwatch_->RealTime());
+      return std::pair<double,double>(stopwatch_->cpuTime(),stopwatch_->realTime());
     }
 
   private:

diff --git a/FWCore/Framework/src/Path.cc b/FWCore/Framework/src/Path.cc
@@ -39,7 +39,7 @@ namespace edm
 	     ParameterSet const& proc_pset,
 	     ActionTable& actions,
 	     ActivityRegistryPtr areg):
-    stopwatch_(new TStopwatch),
+  stopwatch_(new RunStopwatch::StopwatchPointer::element_type),
     timesRun_(),
     timesPassed_(),
     timesFailed_(),
@@ -53,7 +53,6 @@ namespace edm
     act_table_(&actions),
     workers_(workers)
   {
-    stopwatch_->Stop();
   }
 
 #if 0

diff --git a/FWCore/Framework/src/Path.h b/FWCore/Framework/src/Path.h
@@ -5,7 +5,7 @@
 
   Author: Jim Kowalkowski 28-01-06
 
-  $Id: Path.h,v 1.3 2006/02/08 00:44:25 wmtan Exp $
+  $Id: Path.h,v 1.4 2006/04/04 16:55:37 lsexton Exp $
 
   An object of this type represents one path in a job configuration.
   It holds the assigned bit position and the list of workers that are
@@ -57,7 +57,7 @@ namespace edm
     const std::string& name() const { return name_; }
 
     std::pair<double,double> timeCpuReal() const {
-      return std::pair<double,double>(stopwatch_->CpuTime(),stopwatch_->RealTime());
+      return std::pair<double,double>(stopwatch_->cpuTime(),stopwatch_->realTime());
     }
 
     std::pair<double,double> timeCpuReal(const unsigned int i) const {

diff --git a/FWCore/Framework/src/RunStopwatch.h b/FWCore/Framework/src/RunStopwatch.h
@@ -3,7 +3,7 @@
 
 /*----------------------------------------------------------------------
   
-$Id: RunStopwatch.h,v 1.0 2006/02/08 00:44:25 wmtan Exp $
+$Id: RunStopwatch.h,v 1.1 2006/04/04 16:55:37 lsexton Exp $
 
 Simple "guard" class as suggested by Chris Jones to start/stop the
 Stopwatch: creating an object of type RunStopwatch starts the clock
@@ -14,21 +14,21 @@ calls the destructor which stops the clock.
 
 #include "boost/shared_ptr.hpp"
 #include "boost/scoped_ptr.hpp"
-#include "TStopwatch.h"
+#include "FWCore/Utilities/interface/CPUTimer.h"
 
 namespace edm {
 
   class RunStopwatch {
 
   public:
-    typedef boost::shared_ptr<TStopwatch> StopwatchPointer;
+    typedef boost::shared_ptr<CPUTimer> StopwatchPointer;
 
     RunStopwatch(const StopwatchPointer& ptr): stopwatch_(ptr) {
-      stopwatch_->Start(false);
+      stopwatch_->start();
     }
 
     ~RunStopwatch(){
-      stopwatch_->Stop();
+      stopwatch_->stop();
     }
 
   private:

diff --git a/FWCore/Framework/src/Schedule.cc b/FWCore/Framework/src/Schedule.cc
@@ -156,7 +156,7 @@ namespace edm
     makeTriggerResults_(tns.makeTriggerResults()),
     total_events_(),
     total_passed_(),
-    stopwatch_(new TStopwatch),
+    stopwatch_(new RunStopwatch::StopwatchPointer::element_type),
     unscheduled_(new UnscheduledCallProducer)
   {
     ParameterSet defopts;
@@ -270,7 +270,6 @@ namespace edm
        }
     }
 
-    stopwatch_->Stop();
   }
 
   void Schedule::handleWronglyPlacedModules()

diff --git a/FWCore/Framework/src/Worker.cc b/FWCore/Framework/src/Worker.cc
@@ -1,6 +1,6 @@
 
 /*----------------------------------------------------------------------
-$Id: Worker.cc,v 1.7 2006/02/17 22:09:53 wmtan Exp $
+$Id: Worker.cc,v 1.8 2006/04/04 16:55:37 lsexton Exp $
 ----------------------------------------------------------------------*/
 
 #include <iostream>
@@ -32,7 +32,7 @@ namespace edm
 
   Worker::Worker(const ModuleDescription& iMD, 
 		 const WorkerParams& iWP):
-    stopwatch_(new TStopwatch),
+    stopwatch_(new RunStopwatch::StopwatchPointer::element_type),
     timesRun_(),
     timesVisited_(),
     timesPassed_(),
@@ -43,7 +43,6 @@ namespace edm
     actions_(iWP.actions_),
     cached_exception_()
   {
-    stopwatch_->Stop();
   }
 
   Worker::~Worker()

diff --git a/FWCore/Framework/src/Worker.h b/FWCore/Framework/src/Worker.h
@@ -6,7 +6,7 @@
 Worker: this is a basic scheduling unit - an abstract base class to
 something that is really a producer or filter.
 
-$Id: Worker.h,v 1.9 2006/02/08 00:44:25 wmtan Exp $
+$Id: Worker.h,v 1.10 2006/04/04 16:55:37 lsexton Exp $
 
 A worker will not actually call through to the module unless it is
 in a Ready state.  After a module is actually run, the state will not
@@ -54,7 +54,7 @@ namespace edm {
     void connect(ActivityRegistry::PreModule&, ActivityRegistry::PostModule&);
 
     std::pair<double,double> timeCpuReal() const {
-      return std::pair<double,double>(stopwatch_->CpuTime(),stopwatch_->RealTime());
+      return std::pair<double,double>(stopwatch_->cpuTime(),stopwatch_->realTime());
     }
 
     int timesRun() const { return timesRun_; }

diff --git a/FWCore/Framework/src/WorkerInPath.cc b/FWCore/Framework/src/WorkerInPath.cc
@@ -5,27 +5,25 @@
 namespace edm
 {
   WorkerInPath::WorkerInPath(Worker* w, State state):
-    stopwatch_(new TStopwatch),
+    stopwatch_(new RunStopwatch::StopwatchPointer::element_type),
     timesVisited_(),
     timesPassed_(),
     timesFailed_(),
     timesExcept_(),
     state_(state),
     worker_(w)
   {
-    stopwatch_->Stop();
   }
 
   WorkerInPath::WorkerInPath(Worker* w):
-    stopwatch_(new TStopwatch),
+    stopwatch_(new RunStopwatch::StopwatchPointer::element_type),
     timesVisited_(),
     timesPassed_(),
     timesFailed_(),
     timesExcept_(),
     state_(Normal),
     worker_(w)
   {
-    stopwatch_->Stop();
   }
 
   bool WorkerInPath::runWorker(EventPrincipal& ep, EventSetup const & es)

diff --git a/FWCore/Framework/src/WorkerInPath.h b/FWCore/Framework/src/WorkerInPath.h
@@ -5,7 +5,7 @@
 
 	Author: Jim Kowalkowski 28-01-06
 
-	$Id: WorkerInPath.h,v 1.2 2006/02/04 04:31:01 jbk Exp $
+	$Id: WorkerInPath.h,v 1.3 2006/04/04 16:55:37 lsexton Exp $
 
 	A wrapper around a Worker, so that statistics can be managed
 	per path.  A Path holds Workers as these things.
@@ -31,7 +31,7 @@ namespace edm
     bool runWorker(EventPrincipal&, EventSetup const&);
 
     std::pair<double,double> timeCpuReal() const {
-      return std::pair<double,double>(stopwatch_->CpuTime(),stopwatch_->RealTime());
+      return std::pair<double,double>(stopwatch_->cpuTime(),stopwatch_->realTime());
     }
 
     int timesVisited() const { return timesVisited_; }