summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-08-13 00:47:15 +0200
committerSubv <subv2112@gmail.com>2018-08-13 01:40:56 +0200
commit0135b328edb1b58d1ff97cfdc35e05f02cec1c2a (patch)
treea06b72074fc7ef0ae0e69c9ecf83773adabb1308
parentMerge pull request #1029 from bunnei/fix-out-attrib (diff)
downloadyuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.gz
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.bz2
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.lz
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.xz
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.zst
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.zip
-rw-r--r--src/core/core_timing.cpp2
-rw-r--r--src/core/hle/kernel/thread.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index d3bb6f818..f977d1b32 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -135,11 +135,9 @@ void ClearPendingEvents() {
void ScheduleEvent(s64 cycles_into_future, const EventType* event_type, u64 userdata) {
ASSERT(event_type != nullptr);
s64 timeout = GetTicks() + cycles_into_future;
-
// If this event needs to be scheduled before the next advance(), force one early
if (!is_global_timer_sane)
ForceExceptionCheck(cycles_into_future);
-
event_queue.emplace_back(Event{timeout, event_fifo_id++, userdata, event_type});
std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>());
}
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index b9022feae..e308b9c7b 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -155,8 +155,10 @@ void Thread::WakeAfterDelay(s64 nanoseconds) {
if (nanoseconds == -1)
return;
- CoreTiming::ScheduleEvent(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType,
- callback_handle);
+ // This function might be called from any thread so we have to be cautious and use the
+ // thread-safe version of ScheduleEvent.
+ CoreTiming::ScheduleEventThreadsafe(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType,
+ callback_handle);
}
void Thread::CancelWakeupTimer() {