diff options
Diffstat (limited to '')
| -rw-r--r-- | src/common/wall_clock.cpp | 4 | ||||
| -rw-r--r-- | src/common/wall_clock.h | 6 | ||||
| -rw-r--r-- | src/common/x64/native_clock.cpp | 8 | ||||
| -rw-r--r-- | src/common/x64/native_clock.h | 3 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/common/wall_clock.cpp b/src/common/wall_clock.cpp index 452a2837e..a8c143f85 100644 --- a/src/common/wall_clock.cpp +++ b/src/common/wall_clock.cpp | |||
| @@ -17,8 +17,8 @@ using base_time_point = std::chrono::time_point<base_timer>; | |||
| 17 | 17 | ||
| 18 | class StandardWallClock final : public WallClock { | 18 | class StandardWallClock final : public WallClock { |
| 19 | public: | 19 | public: |
| 20 | StandardWallClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency) | 20 | explicit StandardWallClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_) |
| 21 | : WallClock(emulated_cpu_frequency, emulated_clock_frequency, false) { | 21 | : WallClock(emulated_cpu_frequency_, emulated_clock_frequency_, false) { |
| 22 | start_time = base_timer::now(); | 22 | start_time = base_timer::now(); |
| 23 | } | 23 | } |
| 24 | 24 | ||
diff --git a/src/common/wall_clock.h b/src/common/wall_clock.h index bc7adfbf8..cef3e9499 100644 --- a/src/common/wall_clock.h +++ b/src/common/wall_clock.h | |||
| @@ -38,9 +38,9 @@ public: | |||
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | protected: | 40 | protected: |
| 41 | WallClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency, bool is_native) | 41 | explicit WallClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_, bool is_native_) |
| 42 | : emulated_cpu_frequency{emulated_cpu_frequency}, | 42 | : emulated_cpu_frequency{emulated_cpu_frequency_}, |
| 43 | emulated_clock_frequency{emulated_clock_frequency}, is_native{is_native} {} | 43 | emulated_clock_frequency{emulated_clock_frequency_}, is_native{is_native_} {} |
| 44 | 44 | ||
| 45 | u64 emulated_cpu_frequency; | 45 | u64 emulated_cpu_frequency; |
| 46 | u64 emulated_clock_frequency; | 46 | u64 emulated_clock_frequency; |
diff --git a/src/common/x64/native_clock.cpp b/src/common/x64/native_clock.cpp index 424b39b1f..eb8a7782f 100644 --- a/src/common/x64/native_clock.cpp +++ b/src/common/x64/native_clock.cpp | |||
| @@ -43,10 +43,10 @@ u64 EstimateRDTSCFrequency() { | |||
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | namespace X64 { | 45 | namespace X64 { |
| 46 | NativeClock::NativeClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency, | 46 | NativeClock::NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_, |
| 47 | u64 rtsc_frequency) | 47 | u64 rtsc_frequency_) |
| 48 | : WallClock(emulated_cpu_frequency, emulated_clock_frequency, true), rtsc_frequency{ | 48 | : WallClock(emulated_cpu_frequency_, emulated_clock_frequency_, true), rtsc_frequency{ |
| 49 | rtsc_frequency} { | 49 | rtsc_frequency_} { |
| 50 | _mm_mfence(); | 50 | _mm_mfence(); |
| 51 | last_measure = __rdtsc(); | 51 | last_measure = __rdtsc(); |
| 52 | accumulated_ticks = 0U; | 52 | accumulated_ticks = 0U; |
diff --git a/src/common/x64/native_clock.h b/src/common/x64/native_clock.h index 97aab6ac9..6d1e32ac8 100644 --- a/src/common/x64/native_clock.h +++ b/src/common/x64/native_clock.h | |||
| @@ -14,7 +14,8 @@ namespace Common { | |||
| 14 | namespace X64 { | 14 | namespace X64 { |
| 15 | class NativeClock final : public WallClock { | 15 | class NativeClock final : public WallClock { |
| 16 | public: | 16 | public: |
| 17 | NativeClock(u64 emulated_cpu_frequency, u64 emulated_clock_frequency, u64 rtsc_frequency); | 17 | explicit NativeClock(u64 emulated_cpu_frequency_, u64 emulated_clock_frequency_, |
| 18 | u64 rtsc_frequency_); | ||
| 18 | 19 | ||
| 19 | std::chrono::nanoseconds GetTimeNS() override; | 20 | std::chrono::nanoseconds GetTimeNS() override; |
| 20 | 21 | ||