diff options
| author | 2018-08-12 17:47:15 -0500 | |
|---|---|---|
| committer | 2018-08-12 18:40:56 -0500 | |
| commit | 0135b328edb1b58d1ff97cfdc35e05f02cec1c2a (patch) | |
| tree | a06b72074fc7ef0ae0e69c9ecf83773adabb1308 /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #1029 from bunnei/fix-out-attrib (diff) | |
| download | yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.gz yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.xz yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.zip | |
Kernel/Thread: Always use the threadsafe option when scheduling wakeups.
WakeAfterDelay might be called from any host thread, so err on the side of caution and use the thread-safe CoreTiming::ScheduleEventThreadsafe.
Note that CoreTiming is still far from thread-safe, there may be more things we have to work on for it to be up to par with what we want.
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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) { | |||
| 155 | if (nanoseconds == -1) | 155 | if (nanoseconds == -1) |
| 156 | return; | 156 | return; |
| 157 | 157 | ||
| 158 | CoreTiming::ScheduleEvent(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType, | 158 | // This function might be called from any thread so we have to be cautious and use the |
| 159 | callback_handle); | 159 | // thread-safe version of ScheduleEvent. |
| 160 | CoreTiming::ScheduleEventThreadsafe(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType, | ||
| 161 | callback_handle); | ||
| 160 | } | 162 | } |
| 161 | 163 | ||
| 162 | void Thread::CancelWakeupTimer() { | 164 | void Thread::CancelWakeupTimer() { |