dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Simplify the new stopwatch code.

Browse source
This commit is contained in:
Jonathan Naylor 2018-07-15 20:30:47 +01:00
parent f30f30d509
commit 51d534034b
6 changed files with 120 additions and 45 deletions

44
YSFGateway/StopWatch.cpp
View file

@ -21,21 +21,32 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
CStopWatch::CStopWatch() : CStopWatch::CStopWatch() :
m_frequency(), m_frequencyS(),
m_frequencyMS(),
m_start() m_start()
{ {
::QueryPerformanceFrequency(&m_frequency); ::QueryPerformanceFrequency(&m_frequencyS);
m_frequencyMS.QuadPart = m_frequencyS.QuadPart / 1000ULL;
} }
CStopWatch::~CStopWatch() 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); ::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() unsigned int CStopWatch::elapsed()
@ -46,7 +57,7 @@ unsigned int CStopWatch::elapsed()
LARGE_INTEGER temp; LARGE_INTEGER temp;
temp.QuadPart = (now.QuadPart - m_start.QuadPart) * 1000; 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 #else
@ -55,7 +66,7 @@ unsigned int CStopWatch::elapsed()
#include <ctime> #include <ctime>
CStopWatch::CStopWatch() : CStopWatch::CStopWatch() :
m_start() m_startMS(0ULL)
{ {
} }
@ -63,11 +74,22 @@ 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 m_start.tv_sec * 1000UL + m_start.tv_nsec / 1000000UL; 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_startMS;
} }
unsigned int CStopWatch::elapsed() unsigned int CStopWatch::elapsed()
@ -75,9 +97,9 @@ unsigned int CStopWatch::elapsed()
struct timespec now; struct timespec now;
::clock_gettime(CLOCK_MONOTONIC, &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 #endif

11
YSFGateway/StopWatch.h
View file

@ -31,15 +31,18 @@ public:
CStopWatch(); CStopWatch();
~CStopWatch(); ~CStopWatch();
unsigned long start(); unsigned long long time() const;
unsigned int elapsed();
unsigned long long start();
unsigned int elapsed();
private: private:
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LARGE_INTEGER m_frequency; LARGE_INTEGER m_frequencyS;
LARGE_INTEGER m_frequencyMS;
LARGE_INTEGER m_start; LARGE_INTEGER m_start;
#else #else
struct timespec m_start; unsigned long long m_startMS;
#endif #endif
}; };

44
YSFParrot/StopWatch.cpp
View file

@ -21,21 +21,32 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
CStopWatch::CStopWatch() : CStopWatch::CStopWatch() :
m_frequency(), m_frequencyS(),
m_frequencyMS(),
m_start() m_start()
{ {
::QueryPerformanceFrequency(&m_frequency); ::QueryPerformanceFrequency(&m_frequencyS);
m_frequencyMS.QuadPart = m_frequencyS.QuadPart / 1000ULL;
} }
CStopWatch::~CStopWatch() 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); ::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() unsigned int CStopWatch::elapsed()
@ -46,7 +57,7 @@ unsigned int CStopWatch::elapsed()
LARGE_INTEGER temp; LARGE_INTEGER temp;
temp.QuadPart = (now.QuadPart - m_start.QuadPart) * 1000; 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 #else
@ -55,7 +66,7 @@ unsigned int CStopWatch::elapsed()
#include <ctime> #include <ctime>
CStopWatch::CStopWatch() : CStopWatch::CStopWatch() :
m_start() m_startMS(0ULL)
{ {
} }
@ -63,11 +74,22 @@ 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 m_start.tv_sec * 1000UL + m_start.tv_nsec / 1000000UL; 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_startMS;
} }
unsigned int CStopWatch::elapsed() unsigned int CStopWatch::elapsed()
@ -75,9 +97,9 @@ unsigned int CStopWatch::elapsed()
struct timespec now; struct timespec now;
::clock_gettime(CLOCK_MONOTONIC, &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 #endif

11
YSFParrot/StopWatch.h
View file

@ -31,15 +31,18 @@ public:
CStopWatch(); CStopWatch();
~CStopWatch(); ~CStopWatch();
unsigned long start(); unsigned long long time() const;
unsigned int elapsed();
unsigned long long start();
unsigned int elapsed();
private: private:
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LARGE_INTEGER m_frequency; LARGE_INTEGER m_frequencyS;
LARGE_INTEGER m_frequencyMS;
LARGE_INTEGER m_start; LARGE_INTEGER m_start;
#else #else
struct timespec m_start; unsigned long long m_startMS;
#endif #endif
}; };

44
YSFReflector/StopWatch.cpp
View file

@ -21,21 +21,32 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
CStopWatch::CStopWatch() : CStopWatch::CStopWatch() :
m_frequency(), m_frequencyS(),
m_frequencyMS(),
m_start() m_start()
{ {
::QueryPerformanceFrequency(&m_frequency); ::QueryPerformanceFrequency(&m_frequencyS);
m_frequencyMS.QuadPart = m_frequencyS.QuadPart / 1000ULL;
} }
CStopWatch::~CStopWatch() 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); ::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() unsigned int CStopWatch::elapsed()
@ -46,7 +57,7 @@ unsigned int CStopWatch::elapsed()
LARGE_INTEGER temp; LARGE_INTEGER temp;
temp.QuadPart = (now.QuadPart - m_start.QuadPart) * 1000; 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 #else
@ -55,7 +66,7 @@ unsigned int CStopWatch::elapsed()
#include <ctime> #include <ctime>
CStopWatch::CStopWatch() : CStopWatch::CStopWatch() :
m_start() m_startMS(0ULL)
{ {
} }
@ -63,11 +74,22 @@ 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 m_start.tv_sec * 1000UL + m_start.tv_nsec / 1000000UL; 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_startMS;
} }
unsigned int CStopWatch::elapsed() unsigned int CStopWatch::elapsed()
@ -75,9 +97,9 @@ unsigned int CStopWatch::elapsed()
struct timespec now; struct timespec now;
::clock_gettime(CLOCK_MONOTONIC, &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 #endif

11
YSFReflector/StopWatch.h
View file

@ -31,15 +31,18 @@ public:
CStopWatch(); CStopWatch();
~CStopWatch(); ~CStopWatch();
unsigned long start(); unsigned long long time() const;
unsigned int elapsed();
unsigned long long start();
unsigned int elapsed();
private: private:
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
LARGE_INTEGER m_frequency; LARGE_INTEGER m_frequencyS;
LARGE_INTEGER m_frequencyMS;
LARGE_INTEGER m_start; LARGE_INTEGER m_start;
#else #else
struct timespec m_start; unsigned long long m_startMS;
#endif #endif
}; };