diff options
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/include/zencore/timer.h | 17 | ||||
| -rw-r--r-- | zencore/timer.cpp | 12 |
2 files changed, 4 insertions, 25 deletions
diff --git a/zencore/include/zencore/timer.h b/zencore/include/zencore/timer.h index eb284eaee..c0f6e20ae 100644 --- a/zencore/include/zencore/timer.h +++ b/zencore/include/zencore/timer.h @@ -23,25 +23,16 @@ ZENCORE_API uint64_t GetHifreqTimerFrequencySafe(); // May be used during stati class Stopwatch { public: - Stopwatch() : m_StartValue(GetHifreqTimerValue()) {} + inline Stopwatch() : m_StartValue(GetHifreqTimerValue()) {} - inline uint64_t getElapsedTimeMs() { return (GetHifreqTimerValue() - m_StartValue) * 1000 / GetHifreqTimerFrequency(); } - - inline void reset() { m_StartValue = GetHifreqTimerValue(); } + inline uint64_t GetElapsedTimeMs() { return (GetHifreqTimerValue() - m_StartValue) * 1'000 / GetHifreqTimerFrequency(); } + inline uint64_t GetElapsedTimeUs() { return (GetHifreqTimerValue() - m_StartValue) * 1'000'000 / GetHifreqTimerFrequency(); } + inline void Reset() { m_StartValue = GetHifreqTimerValue(); } private: uint64_t m_StartValue; }; -// CPU timers - -inline uint64_t -GetCpuTimerValue() -{ - unsigned int foo; - return __rdtscp(&foo); -} - void timer_forcelink(); // internal } // namespace zen diff --git a/zencore/timer.cpp b/zencore/timer.cpp index 88ec89cb7..b2c6cb6a2 100644 --- a/zencore/timer.cpp +++ b/zencore/timer.cpp @@ -73,18 +73,6 @@ timer_forcelink() { } -TEST_CASE("Timer") -{ - uint64_t s0 = GetHifreqTimerValue(); - uint64_t t0 = GetCpuTimerValue(); - zen::Sleep(1000); - uint64_t s1 = GetHifreqTimerValue(); - uint64_t t1 = GetCpuTimerValue(); - // double r = double(t1 - t0) / (s1 - s0); - CHECK_NE(t0, t1); - CHECK_NE(s0, s1); -} - #endif } // namespace zen |