diff options
| author | Subv <subv2112@gmail.com> | 2018-08-12 17:47:15 -0500 | 
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2018-08-12 18:40:56 -0500 | 
| commit | 0135b328edb1b58d1ff97cfdc35e05f02cec1c2a (patch) | |
| tree | a06b72074fc7ef0ae0e69c9ecf83773adabb1308 /src/core/hle | |
| parent | 5926fbd3d7b51e9adeb38b6267191fca4442334e (diff) | |
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')
| -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) {      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() { | 
