diff options
| author | madmaxoft <github@xoft.cz> | 2013-08-30 10:06:41 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-08-30 10:06:41 +0200 |
| commit | 86eb71868bc1c809d69a628c8e0fe51318453695 (patch) | |
| tree | 4a2265d11964e75f3c03c544bd029b29af7f10f4 /source/OSSupport/Timer.cpp | |
| parent | Added g_BlockIsXXX[] arrays to the API. (diff) | |
| download | cuberite-86eb71868bc1c809d69a628c8e0fe51318453695.tar cuberite-86eb71868bc1c809d69a628c8e0fe51318453695.tar.gz cuberite-86eb71868bc1c809d69a628c8e0fe51318453695.tar.bz2 cuberite-86eb71868bc1c809d69a628c8e0fe51318453695.tar.lz cuberite-86eb71868bc1c809d69a628c8e0fe51318453695.tar.xz cuberite-86eb71868bc1c809d69a628c8e0fe51318453695.tar.zst cuberite-86eb71868bc1c809d69a628c8e0fe51318453695.zip | |
Diffstat (limited to 'source/OSSupport/Timer.cpp')
| -rw-r--r-- | source/OSSupport/Timer.cpp | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/source/OSSupport/Timer.cpp b/source/OSSupport/Timer.cpp index ab7325b5e..ed16f9e3a 100644 --- a/source/OSSupport/Timer.cpp +++ b/source/OSSupport/Timer.cpp @@ -8,33 +8,30 @@ -cTimer::cTimer() -#ifdef _WIN32 - : m_TicksPerSecond( new LARGE_INTEGER ) -#endif +cTimer::cTimer(void) { -#ifdef _WIN32 - QueryPerformanceFrequency( (LARGE_INTEGER*)m_TicksPerSecond ); -#endif + #ifdef _WIN32 + QueryPerformanceFrequency(&m_TicksPerSecond); + #endif } -cTimer::~cTimer() + + + + +long long cTimer::GetNowTime(void) { -#ifdef _WIN32 - delete (LARGE_INTEGER*)m_TicksPerSecond; -#endif + #ifdef _WIN32 + LARGE_INTEGER now; + QueryPerformanceCounter(&now); + return ((now.QuadPart * 1000) / m_TicksPerSecond.QuadPart); + #else + struct timeval now; + gettimeofday(&now, NULL); + return (long long)(now.tv_sec * 1000 + now.tv_usec / 1000); + #endif } -long long cTimer::GetNowTime() -{ -#ifdef _WIN32 - LARGE_INTEGER now; - QueryPerformanceCounter( &now ); - LARGE_INTEGER & tps = *((LARGE_INTEGER*)m_TicksPerSecond); - return ((now.QuadPart*1000) / tps.QuadPart ); -#else - struct timeval now; - gettimeofday(&now, NULL); - return (long long)(now.tv_sec*1000 + now.tv_usec/1000); -#endif -}
\ No newline at end of file + + + |