Fix the StopWatch code.

This commit is contained in:
Jonathan Naylor
2018-07-26 18:47:34 +01:00
parent 3738d428cd
commit b92c08ecaf
2 changed files with 8 additions and 9 deletions

View File

@@ -52,6 +52,7 @@ unsigned int CStopWatch::elapsed()
#else
#include <cstdio>
#include <ctime>
CStopWatch::CStopWatch() :
m_start()
@@ -64,21 +65,19 @@ CStopWatch::~CStopWatch()
unsigned long CStopWatch::start()
{
::gettimeofday(&m_start, NULL);
::clock_gettime(CLOCK_MONOTONIC, &m_start);
return m_start.tv_usec;
return m_start.tv_sec * 1000UL + m_start.tv_nsec / 1000000UL;
}
unsigned int CStopWatch::elapsed()
{
struct timeval now;
::gettimeofday(&now, NULL);
struct timespec now;
::clock_gettime(CLOCK_MONOTONIC, &now);
unsigned int elapsed = (now.tv_sec - m_start.tv_sec) * 1000U;
elapsed += now.tv_usec / 1000U;
elapsed -= m_start.tv_usec / 1000U;
int offset = ((now.tv_sec - m_start.tv_sec) * 1000000000UL + now.tv_nsec - m_start.tv_nsec ) / 1000000UL;
return elapsed;
return (unsigned int)offset;
}
#endif

View File

@@ -39,7 +39,7 @@ private:
LARGE_INTEGER m_frequency;
LARGE_INTEGER m_start;
#else
struct timeval m_start;
struct timespec m_start;
#endif
};