diff options
Diffstat (limited to 'src/core/core_timing.cpp')
| -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 | |||
| 33 | const char* name; | 33 | const char* name; |
| 34 | }; | 34 | }; |
| 35 | 35 | ||
| 36 | std::vector<EventType> event_types; | 36 | static std::vector<EventType> event_types; |
| 37 | 37 | ||
| 38 | struct BaseEvent | 38 | struct BaseEvent |
| 39 | { | 39 | { |
| @@ -44,30 +44,30 @@ struct BaseEvent | |||
| 44 | 44 | ||
| 45 | typedef LinkedListItem<BaseEvent> Event; | 45 | typedef LinkedListItem<BaseEvent> Event; |
| 46 | 46 | ||
| 47 | Event* first; | 47 | static Event* first; |
| 48 | Event* ts_first; | 48 | static Event* ts_first; |
| 49 | Event* ts_last; | 49 | static Event* ts_last; |
| 50 | 50 | ||
| 51 | // event pools | 51 | // event pools |
| 52 | Event* event_pool = 0; | 52 | static Event* event_pool = nullptr; |
| 53 | Event* event_ts_pool = 0; | 53 | static Event* event_ts_pool = nullptr; |
| 54 | int allocated_ts_events = 0; | 54 | static int allocated_ts_events = 0; |
| 55 | // Optimization to skip MoveEvents when possible. | 55 | // Optimization to skip MoveEvents when possible. |
| 56 | std::atomic<bool> has_ts_events(false); | 56 | static std::atomic<bool> has_ts_events(false); |
| 57 | 57 | ||
| 58 | int g_slice_length; | 58 | int g_slice_length; |
| 59 | 59 | ||
| 60 | s64 global_timer; | 60 | static s64 global_timer; |
| 61 | s64 idled_cycles; | 61 | static s64 idled_cycles; |
| 62 | s64 last_global_time_ticks; | 62 | static s64 last_global_time_ticks; |
| 63 | s64 last_global_time_us; | 63 | static s64 last_global_time_us; |
| 64 | 64 | ||
| 65 | static std::recursive_mutex external_event_section; | 65 | static std::recursive_mutex external_event_section; |
| 66 | 66 | ||
| 67 | // Warning: not included in save state. | 67 | // Warning: not included in save state. |
| 68 | using AdvanceCallback = void(int cycles_executed); | 68 | using AdvanceCallback = void(int cycles_executed); |
| 69 | AdvanceCallback* advance_callback = nullptr; | 69 | static AdvanceCallback* advance_callback = nullptr; |
| 70 | std::vector<MHzChangeCallback> mhz_change_callbacks; | 70 | static std::vector<MHzChangeCallback> mhz_change_callbacks; |
| 71 | 71 | ||
| 72 | void FireMhzChange() { | 72 | void FireMhzChange() { |
| 73 | for (auto callback : mhz_change_callbacks) | 73 | for (auto callback : mhz_change_callbacks) |