Convert boost timer to std impl

Author: dcwhite

Superbuild/BoostExternal.cmake

@@ -54,7 +54,6 @@ SET(boost_Libraries
   "serialization"
   "system"
   "thread"
-  "timer"
   CACHE INTERNAL "Boost library name.")
 
 IF(BUILD_WITH_PYTHON)

src/Core/Logging/Logger.cc

@@ -37,13 +37,24 @@ using namespace SCIRun::Core::Logging;
 
 LegacyLoggerInterface::~LegacyLoggerInterface() {}
 
+SimpleScopedTimer::SimpleScopedTimer() : start_(std::chrono::steady_clock::now())
+{
+}
+
+double SimpleScopedTimer::elapsedSeconds() const
+{
+  const auto end = std::chrono::steady_clock::now();
+  const std::chrono::duration<double> elapsedSeconds = end - start_;
+  return elapsedSeconds.count();
+}
+
 ScopedTimeRemarker::ScopedTimeRemarker(LegacyLoggerInterface* log, const std::string& label) : log_(log), label_(label)
 {}
 
 ScopedTimeRemarker::~ScopedTimeRemarker()
 {
   std::ostringstream perf;
-  perf << label_ <<  " took " << timer_.elapsed().wall << " seconds." << std::endl;
+  perf << label_ <<  " took " << timer_.elapsedSeconds() << " seconds." << std::endl;
   log_->status(perf.str());
 }
 
@@ -55,7 +66,7 @@ ScopedTimeLogger::ScopedTimeLogger(const std::string& label, bool shouldLog): la
 
 ScopedTimeLogger::~ScopedTimeLogger()
 {
-  auto time = timer_.elapsed().wall;
+  auto time = timer_.elapsedSeconds();
   if (shouldLog_)
     LOG_DEBUG("{} took {} seconds.", label_, time);
 }

src/Core/Logging/ScopedTimeRemarker.h

@@ -32,7 +32,7 @@
 #define CORE_LOGGING_SCOPEDTIMEREMARKER_H
 
 #include <string>
-#include <boost/timer/timer.hpp>
+#include <chrono>
 #include <Core/Logging/LoggerFwd.h>
 #include <Core/Logging/share.h>
 
@@ -42,6 +42,17 @@ namespace SCIRun
   {
     namespace Logging
     {
+      class SCISHARE SimpleScopedTimer
+      {
+      public:
+        SimpleScopedTimer();
+        SimpleScopedTimer(const SimpleScopedTimer&) = delete;
+        SimpleScopedTimer& operator=(const SimpleScopedTimer&) = delete;
+        double elapsedSeconds() const;
+      private:
+        const std::chrono::time_point<std::chrono::steady_clock> start_;
+      };
+
       class SCISHARE ScopedTimeRemarker
       {
       public:
@@ -50,7 +61,7 @@ namespace SCIRun
       private:
         LegacyLoggerInterface* log_;
         std::string label_;
-        boost::timer::cpu_timer timer_;
+        SimpleScopedTimer timer_;
       };
 
       class SCISHARE ScopedTimeLogger
@@ -61,7 +72,7 @@ namespace SCIRun
       private:
         std::string label_;
         bool shouldLog_;
-        boost::timer::cpu_timer timer_;
+        SimpleScopedTimer timer_;
       };
     }
   }

src/Interface/Application/ModuleWidget.cc

@@ -1097,7 +1097,7 @@ bool ModuleWidget::executeWithSignals()
     Q_EMIT signalExecuteButtonIconChangeToStop();
     errored_ = false;
     //colorLocked_ = true; //TODO
-    timer_.start();
+    timer_ = std::make_unique<SimpleScopedTimer>();
     theModule_->executeWithSignals();
     if (!disabled_)
       Q_EMIT updateProgressBarSignal(1);
@@ -1350,7 +1350,7 @@ void ModuleWidget::updateProgressBar(double percent)
 
 void ModuleWidget::updateModuleTime()
 {
-  fullWidgetDisplay_->getProgressBar()->setFormat(QString("%1 s : %p%").arg(timer_.elapsed().wall));
+  fullWidgetDisplay_->getProgressBar()->setFormat(QString("%1 s : %p%").arg(timer_->elapsedSeconds()));
 }
 
 void ModuleWidget::launchDocumentation()

src/Interface/Application/ModuleWidget.h

@@ -34,11 +34,11 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/bimap.hpp>
-#include <boost/timer/timer.hpp>
 #include <deque>
 #include <atomic>
 #include <Interface/Application/Note.h>
 #include <Interface/Application/HasNotes.h>
+#include <Core/Logging/ScopedTimeRemarker.h>
 
 #include <Dataflow/Network/NetworkFwd.h>
 #include <Dataflow/Network/ExecutableObject.h>
@@ -260,7 +260,7 @@ private Q_SLOTS:
   ModuleWidgetDisplayPtr fullWidgetDisplay_;
 private:
   boost::shared_ptr<PortWidgetManager> ports_;
-  boost::timer::cpu_timer timer_;
+  std::unique_ptr<Core::Logging::SimpleScopedTimer> timer_;
   bool deletedFromGui_, colorLocked_;
   bool executedOnce_, skipExecuteDueToFatalError_, disabled_, programmablePortEnabled_{false};
   std::atomic<bool> errored_;

src/Interface/Application/NetworkExecutionProgressBar.cc

@@ -93,12 +93,12 @@ void NetworkExecutionProgressBar::incrementModulesDone(double execTime, const st
     counterLabel_->setText(counterLabelString());
     progressBar_->setValue(numModulesDone_);
     totalExecutionTime_ += execTime;
-    auto wallTime = executionTimer_.elapsed().wall;
     //Green - completed modules\n??? - Unexecuted modules\nRed - errored modules\n
-    progressBar_->setToolTip(QString("Total execution time: %1\nTotal wall time: %2")
-      .arg(totalExecutionTime_).arg(wallTime));
+    progressBar_->setToolTip(QString("Total execution time: %1\nTotal wall time: TODO")
+      .arg(totalExecutionTime_));// .arg(wallTime));
     timingStream_ << '\t' << moduleId.c_str() << "," << execTime << ',' << totalExecutionTime_
-      << ','  << wallTime << '\n';
+       //      << ','  << wallTime
+      << '\n';
 
     if (numModulesDone_ == totalModules_)
       timingStream_ << "TIMING LOG: " << "execution ended at " << QTime::currentTime().toString("hh:mm:ss.zzz") << '\n';
@@ -110,7 +110,7 @@ void NetworkExecutionProgressBar::resetModulesDone()
   Guard g(mutex_.get());
   numModulesDone_ = 0;
   totalExecutionTime_ = 0;
-  executionTimer_.stop();
+  //executionTimer_.reset();
   counterLabel_->setText(counterLabelString());
   progressBar_->setValue(numModulesDone_);
   progressBar_->setToolTip("");

src/Interface/Application/NetworkExecutionProgressBar.h

@@ -33,8 +33,8 @@
 #include <QTextStream>
 #include <QProgressBar>
 #ifndef Q_MOC_RUN
+#include <Core/Logging/ScopedTimeRemarker.h>
 #include <Core/Utils/SmartPointers.h>
-#include <boost/timer/timer.hpp>
 #include <Core/Thread/Mutex.h>
 #endif
 
@@ -98,7 +98,7 @@ class NetworkExecutionProgressBar : public QObject
   size_t totalModules_;
   double totalExecutionTime_;
   Core::Thread::Mutex mutex_;
-  boost::timer::cpu_timer executionTimer_;
+  //std::unique_ptr<Core::Logging::SimpleScopedTimer> executionTimer_;
   QString timingLog_;
   QTextStream timingStream_;
 

src/Testing/Utils/MatrixTestUtilities.h

@@ -32,7 +32,6 @@
 #include <gtest/gtest.h>
 #include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <boost/timer/timer.hpp>
 #include <boost/assign.hpp>
 #include <boost/filesystem.hpp>
 #include <stdexcept>
@@ -41,9 +40,12 @@
 #include <Core/Datatypes/DenseColumnMatrix.h>
 #include <Core/Datatypes/SparseRowMatrix.h>
 #include <Core/Utils/StringUtil.h>
+#include <Core/Logging/ScopedTimeRemarker.h>
 
 #include <Testing/Utils/share.h>
 
+
+
 namespace SCIRun
 {
 
@@ -214,17 +216,16 @@ struct SCISHARE ScopedTimer
   explicit ScopedTimer(const std::string& name) : name_(name)
   {
     std::cout << "Starting timer " << name_ << std::endl;
-    //t_.start();
   }
 
   ~ScopedTimer()
   {
-    auto elapsed = t_.elapsed().wall;
+    const auto elapsed = t_.elapsedSeconds();
     std::cout << "Timer " << name_ << " stopped at " << elapsed << " seconds." << std::endl;
   }
 
   std::string name_;
-  boost::timer::cpu_timer t_;
+  Core::Logging::SimpleScopedTimer t_;
 };
 
 // TODO: move to Field utils file