citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-28 12:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #498 from lioncash/statics

Browse source 
core_timing: Mark several variables as static
This commit is contained in:
bunnei 2015-01-20 14:34:07 -05:00
parent 7c21b80236 bfef0aa07e
commit 8571befc64
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/core/core_timing.cpp
View file

@ -33,7 +33,7 @@ struct EventType
const char* name; const char* name;
}; };
std::vector<EventType> event_types; static std::vector<EventType> event_types;
struct BaseEvent struct BaseEvent
{ {
@ -44,30 +44,30 @@ struct BaseEvent
typedef LinkedListItem<BaseEvent> Event; typedef LinkedListItem<BaseEvent> Event;
Event* first; static Event* first;
Event* ts_first; static Event* ts_first;
Event* ts_last; static Event* ts_last;
// event pools // event pools
Event* event_pool = 0; static Event* event_pool = nullptr;
Event* event_ts_pool = 0; static Event* event_ts_pool = nullptr;
int allocated_ts_events = 0; static int allocated_ts_events = 0;
// Optimization to skip MoveEvents when possible. // 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; int g_slice_length;
s64 global_timer; static s64 global_timer;
s64 idled_cycles; static s64 idled_cycles;
s64 last_global_time_ticks; static s64 last_global_time_ticks;
s64 last_global_time_us; static s64 last_global_time_us;
static std::recursive_mutex external_event_section; static std::recursive_mutex external_event_section;
// Warning: not included in save state. // Warning: not included in save state.
using AdvanceCallback = void(int cycles_executed); using AdvanceCallback = void(int cycles_executed);
AdvanceCallback* advance_callback = nullptr; static AdvanceCallback* advance_callback = nullptr;
std::vector<MHzChangeCallback> mhz_change_callbacks; static std::vector<MHzChangeCallback> mhz_change_callbacks;
void FireMhzChange() { void FireMhzChange() {
for (auto callback : mhz_change_callbacks) for (auto callback : mhz_change_callbacks)