flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Rewritten cTimer not to use heap allocation.

Browse Source
This commit is contained in:
madmaxoft 2013-08-30 10:06:41 +02:00
parent cdd0eba1b5
commit 86eb71868b
2 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/OSSupport/Timer.cpp
View File

@ -8,33 +8,30 @@
cTimer::cTimer() cTimer::cTimer(void)
#ifdef _WIN32
: m_TicksPerSecond( new LARGE_INTEGER )
#endif
{ {
#ifdef _WIN32 #ifdef _WIN32
QueryPerformanceFrequency( (LARGE_INTEGER*)m_TicksPerSecond ); QueryPerformanceFrequency(&m_TicksPerSecond);
#endif #endif
} }
cTimer::~cTimer()
long long cTimer::GetNowTime(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
delete (LARGE_INTEGER*)m_TicksPerSecond; LARGE_INTEGER now;
#endif 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
}

31
source/OSSupport/Timer.h
View File

@ -1,15 +1,32 @@
// Timer.h
// Declares the cTimer class representing an OS-independent of retrieving current time with msec accuracy
#pragma once #pragma once
class cTimer class cTimer
{ {
public: public:
cTimer(); cTimer(void);
~cTimer();
long long GetNowTime(); // Returns the current time expressed in milliseconds
long long GetNowTime(void);
private: private:
#ifdef _WIN32 #ifdef _WIN32
void* m_TicksPerSecond; // LARGE_INTEGER* LARGE_INTEGER m_TicksPerSecond;
#endif #endif
}; } ;