diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-30 10:26:38 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-30 10:29:33 +0100 |
commit | 824b8e408608491f44b1f934e591a4dab0831fea (patch) | |
tree | 5246439fdff550432288373ce0bb1261209db6c5 | |
parent | kernel/scheduler: Use deduction guides on mutex locks (diff) | |
download | yuzu-824b8e408608491f44b1f934e591a4dab0831fea.tar yuzu-824b8e408608491f44b1f934e591a4dab0831fea.tar.gz yuzu-824b8e408608491f44b1f934e591a4dab0831fea.tar.bz2 yuzu-824b8e408608491f44b1f934e591a4dab0831fea.tar.lz yuzu-824b8e408608491f44b1f934e591a4dab0831fea.tar.xz yuzu-824b8e408608491f44b1f934e591a4dab0831fea.tar.zst yuzu-824b8e408608491f44b1f934e591a4dab0831fea.zip |
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/scheduler.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index c02e54aa1..ac501bf7f 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -148,7 +148,7 @@ void Scheduler::Reschedule() { SwitchContext(next); } -void Scheduler::AddThread(SharedPtr<Thread> thread, u32 priority) { +void Scheduler::AddThread(SharedPtr<Thread> thread) { std::lock_guard lock{scheduler_mutex}; thread_list.push_back(std::move(thread)); diff --git a/src/core/hle/kernel/scheduler.h b/src/core/hle/kernel/scheduler.h index 44baeb713..b29bf7be8 100644 --- a/src/core/hle/kernel/scheduler.h +++ b/src/core/hle/kernel/scheduler.h @@ -38,7 +38,7 @@ public: u64 GetLastContextSwitchTicks() const; /// Adds a new thread to the scheduler - void AddThread(SharedPtr<Thread> thread, u32 priority); + void AddThread(SharedPtr<Thread> thread); /// Removes a thread from the scheduler void RemoveThread(Thread* thread); diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index e5853c46f..fa3ac3abc 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -199,7 +199,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(KernelCore& kernel, std::string name thread->callback_handle = kernel.ThreadWakeupCallbackHandleTable().Create(thread).Unwrap(); thread->owner_process = &owner_process; thread->scheduler = &system.Scheduler(processor_id); - thread->scheduler->AddThread(thread, priority); + thread->scheduler->AddThread(thread); thread->tls_address = thread->owner_process->MarkNextAvailableTLSSlotAsUsed(*thread); // TODO(peachum): move to ScheduleThread() when scheduler is added so selected core is used @@ -352,7 +352,7 @@ void Thread::ChangeScheduler() { if (*new_processor_id != processor_id) { // Remove thread from previous core's scheduler scheduler->RemoveThread(this); - next_scheduler.AddThread(this, current_priority); + next_scheduler.AddThread(this); } processor_id = *new_processor_id; |