diff options
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index ae5f2c8bd..bf850e0b2 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -46,9 +46,9 @@ Thread::~Thread() = default; | |||
| 46 | void Thread::Stop() { | 46 | void Thread::Stop() { |
| 47 | // Cancel any outstanding wakeup events for this thread | 47 | // Cancel any outstanding wakeup events for this thread |
| 48 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), | 48 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), |
| 49 | callback_handle); | 49 | global_handle); |
| 50 | kernel.ThreadWakeupCallbackHandleTable().Close(callback_handle); | 50 | kernel.GlobalHandleTable().Close(global_handle); |
| 51 | callback_handle = 0; | 51 | global_handle = 0; |
| 52 | SetStatus(ThreadStatus::Dead); | 52 | SetStatus(ThreadStatus::Dead); |
| 53 | Signal(); | 53 | Signal(); |
| 54 | 54 | ||
| @@ -73,12 +73,12 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { | |||
| 73 | // thread-safe version of ScheduleEvent. | 73 | // thread-safe version of ScheduleEvent. |
| 74 | const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds}); | 74 | const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds}); |
| 75 | Core::System::GetInstance().CoreTiming().ScheduleEvent( | 75 | Core::System::GetInstance().CoreTiming().ScheduleEvent( |
| 76 | cycles, kernel.ThreadWakeupCallbackEventType(), callback_handle); | 76 | cycles, kernel.ThreadWakeupCallbackEventType(), global_handle); |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void Thread::CancelWakeupTimer() { | 79 | void Thread::CancelWakeupTimer() { |
| 80 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), | 80 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), |
| 81 | callback_handle); | 81 | global_handle); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | void Thread::ResumeFromWait() { | 84 | void Thread::ResumeFromWait() { |
| @@ -190,7 +190,7 @@ ResultVal<std::shared_ptr<Thread>> Thread::Create(KernelCore& kernel, std::strin | |||
| 190 | thread->condvar_wait_address = 0; | 190 | thread->condvar_wait_address = 0; |
| 191 | thread->wait_handle = 0; | 191 | thread->wait_handle = 0; |
| 192 | thread->name = std::move(name); | 192 | thread->name = std::move(name); |
| 193 | thread->callback_handle = kernel.ThreadWakeupCallbackHandleTable().Create(thread).Unwrap(); | 193 | thread->global_handle = kernel.GlobalHandleTable().Create(thread).Unwrap(); |
| 194 | thread->owner_process = &owner_process; | 194 | thread->owner_process = &owner_process; |
| 195 | auto& scheduler = kernel.GlobalScheduler(); | 195 | auto& scheduler = kernel.GlobalScheduler(); |
| 196 | scheduler.AddThread(thread); | 196 | scheduler.AddThread(thread); |