diff options
author | bunnei <bunneidev@gmail.com> | 2015-01-20 20:34:07 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-01-20 20:34:07 +0100 |
commit | 8571befc6466a473a3dce95948bf71c6499b05d8 (patch) | |
tree | 7d990ead4915577deac7699b0e9c937595675636 | |
parent | Merge pull request #499 from lioncash/docs (diff) | |
parent | core_timing: Mark several variables as static (diff) | |
download | yuzu-8571befc6466a473a3dce95948bf71c6499b05d8.tar yuzu-8571befc6466a473a3dce95948bf71c6499b05d8.tar.gz yuzu-8571befc6466a473a3dce95948bf71c6499b05d8.tar.bz2 yuzu-8571befc6466a473a3dce95948bf71c6499b05d8.tar.lz yuzu-8571befc6466a473a3dce95948bf71c6499b05d8.tar.xz yuzu-8571befc6466a473a3dce95948bf71c6499b05d8.tar.zst yuzu-8571befc6466a473a3dce95948bf71c6499b05d8.zip |
-rw-r--r-- | src/core/core_timing.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index ec9d52a08..3aebd7e9d 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -33,7 +33,7 @@ struct EventType const char* name; }; -std::vector<EventType> event_types; +static std::vector<EventType> event_types; struct BaseEvent { @@ -44,30 +44,30 @@ struct BaseEvent typedef LinkedListItem<BaseEvent> Event; -Event* first; -Event* ts_first; -Event* ts_last; +static Event* first; +static Event* ts_first; +static Event* ts_last; // event pools -Event* event_pool = 0; -Event* event_ts_pool = 0; -int allocated_ts_events = 0; +static Event* event_pool = nullptr; +static Event* event_ts_pool = nullptr; +static int allocated_ts_events = 0; // Optimization to skip MoveEvents when possible. -std::atomic<bool> has_ts_events(false); +static std::atomic<bool> has_ts_events(false); int g_slice_length; -s64 global_timer; -s64 idled_cycles; -s64 last_global_time_ticks; -s64 last_global_time_us; +static s64 global_timer; +static s64 idled_cycles; +static s64 last_global_time_ticks; +static s64 last_global_time_us; static std::recursive_mutex external_event_section; // Warning: not included in save state. using AdvanceCallback = void(int cycles_executed); -AdvanceCallback* advance_callback = nullptr; -std::vector<MHzChangeCallback> mhz_change_callbacks; +static AdvanceCallback* advance_callback = nullptr; +static std::vector<MHzChangeCallback> mhz_change_callbacks; void FireMhzChange() { for (auto callback : mhz_change_callbacks) |