Clean up cpu_timer

Author: daleroberts

dynadjust/dynadjust/dnaadjust/dnaadjust.hpp

@@ -106,30 +106,7 @@ namespace networkadjust {
 
 extern std::mutex maxCorrMutex;
 
-// Moved cpu_timer to dnatimer.hpp
-class cpu_timer {
-public:
-    struct cpu_times {
-        std::chrono::nanoseconds wall;
-        std::chrono::nanoseconds user;
-        std::chrono::nanoseconds system;
-    };
-
-    cpu_timer() { start(); }
-    
-    void start() {
-        start_time_ = std::chrono::high_resolution_clock::now();
-    }
-    
-    cpu_times elapsed() const {
-        auto end_time = std::chrono::high_resolution_clock::now();
-        auto wall_duration = std::chrono::duration_cast<std::chrono::nanoseconds>(end_time - start_time_);
-        return {wall_duration, wall_duration, wall_duration}; // For simplicity, user and system = wall
-    }
-
-private:
-    std::chrono::high_resolution_clock::time_point start_time_;
-};
+using dynadjust::cpu_timer;
 
 // forward declaration of dna_adjust
 class dna_adjust;

dynadjust/dynadjust/dnageoidwrapper/dnageoidwrapper.hpp

@@ -63,35 +63,14 @@
 #include <include/functions/dnatemplatedatetimefuncs.hpp>
 #include <include/functions/dnastrmanipfuncs.hpp>
 #include <include/functions/dnatemplatefuncs.hpp>
+#include <include/functions/dnatimer.hpp>
 
 #include <dynadjust/dnageoid/dnageoid.hpp>
 
 using namespace dynadjust::geoidinterpolation;
 
-// High-precision timer class to replace boost::timer::cpu_timer
-class cpu_timer {
-public:
-    struct cpu_times {
-        std::chrono::nanoseconds wall;
-        std::chrono::nanoseconds user;
-        std::chrono::nanoseconds system;
-    };
-
-    cpu_timer() { start(); }
-    
-    void start() {
-        start_time_ = std::chrono::high_resolution_clock::now();
-    }
-    
-    cpu_times elapsed() const {
-        auto end_time = std::chrono::high_resolution_clock::now();
-        auto wall_duration = std::chrono::duration_cast<std::chrono::nanoseconds>(end_time - start_time_);
-        return {wall_duration, wall_duration, wall_duration}; // For simplicity, user and system = wall
-    }
-
-private:
-    std::chrono::high_resolution_clock::time_point start_time_;
-};
+// Use cpu_timer from dnatimer.hpp
+using dynadjust::cpu_timer;
 
 bool CreateNTv2Grid(dna_geoid_interpolation* g, const char* dat_gridfilePath, const n_file_par* grid);
 bool createGridIndex(dna_geoid_interpolation* g, const char* gridfilePath, const char* gridfileType, const int& quiet);

dynadjust/dynadjust/dnaimportwrapper/dnaimportwrapper.hpp

@@ -62,6 +62,7 @@
 #include <include/functions/dnaiostreamfuncs.hpp>
 #include <include/functions/dnafilepathfuncs.hpp>
 #include <include/functions/dnastrmanipfuncs.hpp>
+#include <include/functions/dnatimer.hpp>
 
 #include <dynadjust/dnaimport/dnainterop.hpp>
 
@@ -72,30 +73,7 @@ using namespace dynadjust::datum_parameters;
 extern bool running;
 extern std::mutex cout_mutex;
 
-// High-precision timer class to replace boost::timer::cpu_timer
-class cpu_timer {
-public:
-    struct cpu_times {
-        std::chrono::nanoseconds wall;
-        std::chrono::nanoseconds user;
-        std::chrono::nanoseconds system;
-    };
-
-    cpu_timer() { start(); }
-    
-    void start() {
-        start_time_ = std::chrono::high_resolution_clock::now();
-    }
-    
-    cpu_times elapsed() const {
-        auto end_time = std::chrono::high_resolution_clock::now();
-        auto wall_duration = std::chrono::duration_cast<std::chrono::nanoseconds>(end_time - start_time_);
-        return {wall_duration, wall_duration, wall_duration}; // For simplicity, user and system = wall
-    }
-
-private:
-    std::chrono::high_resolution_clock::time_point start_time_;
-};
+using dynadjust::cpu_timer;
 
 class dna_import_thread
 {

dynadjust/dynadjust/dnasegment/dnasegment.hpp

@@ -60,6 +60,7 @@
 #include <include/io/bms_file.hpp>
 #include <include/io/map_file.hpp>
 #include <include/io/seg_file.hpp>
+#include <include/functions/dnatimer.hpp>
 
 using namespace dynadjust::measurements;
 using namespace dynadjust::exception;
@@ -68,30 +69,8 @@ using namespace dynadjust::iostreams;
 namespace dynadjust {
 namespace networksegment {
 
-// High-precision timer class to replace boost::timer::cpu_timer
-class cpu_timer {
-public:
-    struct cpu_times {
-        std::chrono::nanoseconds wall;
-        std::chrono::nanoseconds user;
-        std::chrono::nanoseconds system;
-    };
-
-    cpu_timer() { start(); }
-    
-    void start() {
-        start_time_ = std::chrono::high_resolution_clock::now();
-    }
-    
-    cpu_times elapsed() const {
-        auto end_time = std::chrono::high_resolution_clock::now();
-        auto wall_duration = std::chrono::duration_cast<std::chrono::nanoseconds>(end_time - start_time_);
-        return {wall_duration, wall_duration, wall_duration}; // For simplicity, user and system = wall
-    }
-
-private:
-    std::chrono::high_resolution_clock::time_point start_time_;
-};
+// Use cpu_timer from dnatimer.hpp
+using dynadjust::cpu_timer;
 
 // This class is exported from the dnaSegment.dll
 #ifdef _MSC_VER

dynadjust/dynadjust/metadata/metadata.cpp

@@ -34,6 +34,7 @@ std::mutex import_file_mutex;
 #include <include/functions/dnafilepathfuncs.hpp>
 #include <include/functions/dnastrmanipfuncs.hpp>
 #include <include/functions/dnastrutils.hpp>
+#include <include/functions/dnatimer.hpp>
 
 #include <include/parameters/dnadatum.hpp>
 
@@ -451,7 +452,7 @@ int main(int argc, char* argv[])
 		std::cout << "+ Parsing: " << std::endl;
 	}
 
-	boost::timer::cpu_timer time;	// constructor of boost::timer::cpu_timer calls start()
+	cpu_timer time;	// constructor of cpu_timer calls start()
 
 	std::ifstream*	ifsDynaML_;
 	size_t		sifsFileSize_, measurementUpdateCount(0), unsureFrameCount(0), unsureEpochCount(0);
@@ -572,8 +573,8 @@ int main(int argc, char* argv[])
 		} 
 
 		// Finish up
-		time.stop();
-		elapsed_time = boost::posix_time::milliseconds(time.elapsed().wall/MILLI_TO_NANO);
+		auto elapsed = time.elapsed();
+		elapsed_time = boost::posix_time::milliseconds(elapsed.wall.count() / MILLI_TO_NANO);
 
 		if (!p.g.quiet)
 		{

dynadjust/dynadjust/metadata/precompile.h

@@ -15,7 +15,7 @@
 /// \cond
 #include <windows.h>
 
-#include <boost/timer/timer.hpp>
+#include <include/functions/dnatimer.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>