Merge branch 'master' of github.com:g4klx/DMRGateway

StopWatch.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -21,21 +21,32 @@
 #if defined(_WIN32) || defined(_WIN64)
 
 CStopWatch::CStopWatch() :
-m_frequency(),
+m_frequencyS(),
+m_frequencyMS(),
 m_start()
 {
-	::QueryPerformanceFrequency(&m_frequency);
+	::QueryPerformanceFrequency(&m_frequencyS);
+
+	m_frequencyMS.QuadPart = m_frequencyS.QuadPart / 1000ULL;
 }
 
 CStopWatch::~CStopWatch()
 {
 }
 
-unsigned long CStopWatch::start()
+unsigned long long CStopWatch::time() const
+{
+	LARGE_INTEGER now;
+	::QueryPerformanceCounter(&now);
+
+	return (unsigned long long)(now.QuadPart / m_frequencyMS.QuadPart);
+}
+
+unsigned long long CStopWatch::start()
 {
 	::QueryPerformanceCounter(&m_start);
 
-	return (unsigned long)(m_start.QuadPart / m_frequency.QuadPart);
+	return (unsigned long long)(m_start.QuadPart / m_frequencyS.QuadPart);
 }
 
 unsigned int CStopWatch::elapsed()
@@ -46,7 +57,7 @@ unsigned int CStopWatch::elapsed()
 	LARGE_INTEGER temp;
 	temp.QuadPart = (now.QuadPart - m_start.QuadPart) * 1000;
 
-	return (unsigned int)(temp.QuadPart / m_frequency.QuadPart);
+	return (unsigned int)(temp.QuadPart / m_frequencyS.QuadPart);
 }
 
 #else
@@ -55,29 +66,40 @@ unsigned int CStopWatch::elapsed()
 #include <ctime>
 
 CStopWatch::CStopWatch() :
-m_start()
+m_startMS(0ULL)
 {
 }
 
 CStopWatch::~CStopWatch()
 {
 }
 
-unsigned long CStopWatch::start()
+unsigned long long CStopWatch::time() const
 {
-	::clock_gettime(CLOCK_MONOTONIC, &m_start);
+	struct timeval now;
+	::gettimeofday(&now, NULL);
+
+	return now.tv_sec * 1000ULL + now.tv_usec / 1000ULL;
+}
+
+unsigned long long CStopWatch::start()
+{
+	struct timespec now;
+	::clock_gettime(CLOCK_MONOTONIC, &now);
+
+	m_startMS = now.tv_sec * 1000ULL + now.tv_nsec / 1000000ULL;
 
-	return m_start.tv_sec * 1000UL + m_start.tv_nsec / 1000000UL;
+	return m_startMS;
 }
 
 unsigned int CStopWatch::elapsed()
 {
 	struct timespec now;
 	::clock_gettime(CLOCK_MONOTONIC, &now);
 
-	int offset = ((now.tv_sec - m_start.tv_sec) * 1000000000UL + now.tv_nsec - m_start.tv_nsec ) / 1000000UL;
+	unsigned long long nowMS = now.tv_sec * 1000ULL + now.tv_nsec / 1000000ULL;
 
-	return (unsigned int)offset;
+	return nowMS - m_startMS;
 }
 
 #endif

StopWatch.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2018 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -31,15 +31,18 @@ class CStopWatch
 	CStopWatch();
 	~CStopWatch();
 
-	unsigned long start();
-	unsigned int  elapsed();
+	unsigned long long time() const;
+
+	unsigned long long start();
+	unsigned int       elapsed();
 
 private:
 #if defined(_WIN32) || defined(_WIN64)
-	LARGE_INTEGER  m_frequency;
+	LARGE_INTEGER  m_frequencyS;
+	LARGE_INTEGER  m_frequencyMS;
 	LARGE_INTEGER  m_start;
 #else
-	struct timespec m_start;
+	unsigned long long m_startMS;
 #endif
 };