summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-01-20 19:47:53 +0100
committerLioncash <mathew1800@gmail.com>2015-01-20 19:49:10 +0100
commitbfef0aa07e52e2b91ece7ab556c2cc9ef0523267 (patch)
tree484ce5a7c67330a048dbe34247404086e6c4c368
parentMerge pull request #492 from archshift/apt (diff)
downloadyuzu-bfef0aa07e52e2b91ece7ab556c2cc9ef0523267.tar
yuzu-bfef0aa07e52e2b91ece7ab556c2cc9ef0523267.tar.gz
yuzu-bfef0aa07e52e2b91ece7ab556c2cc9ef0523267.tar.bz2
yuzu-bfef0aa07e52e2b91ece7ab556c2cc9ef0523267.tar.lz
yuzu-bfef0aa07e52e2b91ece7ab556c2cc9ef0523267.tar.xz
yuzu-bfef0aa07e52e2b91ece7ab556c2cc9ef0523267.tar.zst
yuzu-bfef0aa07e52e2b91ece7ab556c2cc9ef0523267.zip
-rw-r--r--src/core/core_timing.cpp28
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)