summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/scheduler.cpp2
-rw-r--r--src/core/hle/kernel/scheduler.h2
-rw-r--r--src/core/hle/kernel/thread.cpp4
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() {
148 SwitchContext(next); 148 SwitchContext(next);
149} 149}
150 150
151void Scheduler::AddThread(SharedPtr<Thread> thread, u32 priority) { 151void Scheduler::AddThread(SharedPtr<Thread> thread) {
152 std::lock_guard lock{scheduler_mutex}; 152 std::lock_guard lock{scheduler_mutex};
153 153
154 thread_list.push_back(std::move(thread)); 154 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:
38 u64 GetLastContextSwitchTicks() const; 38 u64 GetLastContextSwitchTicks() const;
39 39
40 /// Adds a new thread to the scheduler 40 /// Adds a new thread to the scheduler
41 void AddThread(SharedPtr<Thread> thread, u32 priority); 41 void AddThread(SharedPtr<Thread> thread);
42 42
43 /// Removes a thread from the scheduler 43 /// Removes a thread from the scheduler
44 void RemoveThread(Thread* thread); 44 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
199 thread->callback_handle = kernel.ThreadWakeupCallbackHandleTable().Create(thread).Unwrap(); 199 thread->callback_handle = kernel.ThreadWakeupCallbackHandleTable().Create(thread).Unwrap();
200 thread->owner_process = &owner_process; 200 thread->owner_process = &owner_process;
201 thread->scheduler = &system.Scheduler(processor_id); 201 thread->scheduler = &system.Scheduler(processor_id);
202 thread->scheduler->AddThread(thread, priority); 202 thread->scheduler->AddThread(thread);
203 thread->tls_address = thread->owner_process->MarkNextAvailableTLSSlotAsUsed(*thread); 203 thread->tls_address = thread->owner_process->MarkNextAvailableTLSSlotAsUsed(*thread);
204 204
205 // TODO(peachum): move to ScheduleThread() when scheduler is added so selected core is used 205 // TODO(peachum): move to ScheduleThread() when scheduler is added so selected core is used
@@ -352,7 +352,7 @@ void Thread::ChangeScheduler() {
352 if (*new_processor_id != processor_id) { 352 if (*new_processor_id != processor_id) {
353 // Remove thread from previous core's scheduler 353 // Remove thread from previous core's scheduler
354 scheduler->RemoveThread(this); 354 scheduler->RemoveThread(this);
355 next_scheduler.AddThread(this, current_priority); 355 next_scheduler.AddThread(this);
356 } 356 }
357 357
358 processor_id = *new_processor_id; 358 processor_id = *new_processor_id;