diff options
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 3259397b2..b5925193c 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -61,19 +61,14 @@ public: | |||
| 61 | /// required to end slice - 1 and start slice 0 before the first cycle of code is executed. | 61 | /// required to end slice - 1 and start slice 0 before the first cycle of code is executed. |
| 62 | void Initialize(std::function<void()>&& on_thread_init_); | 62 | void Initialize(std::function<void()>&& on_thread_init_); |
| 63 | 63 | ||
| 64 | /// Tears down all timing related functionality. | 64 | /// Clear all pending events. This should ONLY be done on exit. |
| 65 | void Shutdown(); | 65 | void ClearPendingEvents(); |
| 66 | 66 | ||
| 67 | /// Sets if emulation is multicore or single core, must be set before Initialize | 67 | /// Sets if emulation is multicore or single core, must be set before Initialize |
| 68 | void SetMulticore(bool is_multicore_) { | 68 | void SetMulticore(bool is_multicore_) { |
| 69 | is_multicore = is_multicore_; | 69 | is_multicore = is_multicore_; |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /// Check if it's using host timing. | ||
| 73 | bool IsHostTiming() const { | ||
| 74 | return is_multicore; | ||
| 75 | } | ||
| 76 | |||
| 77 | /// Pauses/Unpauses the execution of the timer thread. | 72 | /// Pauses/Unpauses the execution of the timer thread. |
| 78 | void Pause(bool is_paused); | 73 | void Pause(bool is_paused); |
| 79 | 74 | ||
| @@ -136,12 +131,11 @@ public: | |||
| 136 | private: | 131 | private: |
| 137 | struct Event; | 132 | struct Event; |
| 138 | 133 | ||
| 139 | /// Clear all pending events. This should ONLY be done on exit. | ||
| 140 | void ClearPendingEvents(); | ||
| 141 | |||
| 142 | static void ThreadEntry(CoreTiming& instance); | 134 | static void ThreadEntry(CoreTiming& instance); |
| 143 | void ThreadLoop(); | 135 | void ThreadLoop(); |
| 144 | 136 | ||
| 137 | void Reset(); | ||
| 138 | |||
| 145 | std::unique_ptr<Common::WallClock> clock; | 139 | std::unique_ptr<Common::WallClock> clock; |
| 146 | 140 | ||
| 147 | s64 global_timer = 0; | 141 | s64 global_timer = 0; |