franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct PrepareReschedule

This commit is contained in:
Fernando Sahmkow 2019-04-02 09:22:53 -04:00 committed by FernandoS27
parent 3a94e7ea33
commit fcc6b34fff
6 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/core.cpp
View File

@ -404,6 +404,11 @@ void System::PrepareReschedule() {
CurrentCpuCore().PrepareReschedule(); CurrentCpuCore().PrepareReschedule();
} }
void System::PrepareReschedule(s32 core_index) {
if (core_index >= 0)
CpuCore(core_index).PrepareReschedule();
}
PerfStatsResults System::GetAndResetPerfStats() { PerfStatsResults System::GetAndResetPerfStats() {
return impl->GetAndResetPerfStats(); return impl->GetAndResetPerfStats();
} }

3
src/core/core.h
View File

@ -185,6 +185,9 @@ public:
/// Prepare the core emulation for a reschedule /// Prepare the core emulation for a reschedule
void PrepareReschedule(); void PrepareReschedule();
/// Prepare the core emulation for a reschedule
void PrepareReschedule(s32 core_index);
/// Gets and resets core performance statistics /// Gets and resets core performance statistics
PerfStatsResults GetAndResetPerfStats(); PerfStatsResults GetAndResetPerfStats();

2
src/core/core_cpu.h
View File

@ -14,7 +14,7 @@
namespace Kernel { namespace Kernel {
class Scheduler; class Scheduler;
class GlobalScheduler; class GlobalScheduler;
} } // namespace Kernel
namespace Core { namespace Core {
class System; class System;

5
src/core/hle/kernel/address_arbiter.cpp
View File

@ -37,8 +37,7 @@ void WakeThreads(const std::vector<SharedPtr<Thread>>& waiting_threads, s32 num_
waiting_threads[i]->SetWaitSynchronizationResult(RESULT_SUCCESS); waiting_threads[i]->SetWaitSynchronizationResult(RESULT_SUCCESS);
waiting_threads[i]->SetArbiterWaitAddress(0); waiting_threads[i]->SetArbiterWaitAddress(0);
waiting_threads[i]->ResumeFromWait(); waiting_threads[i]->ResumeFromWait();
if (waiting_threads[i]->GetProcessorID() >= 0) system.PrepareReschedule(waiting_threads[i]->GetProcessorID());
system.CpuCore(waiting_threads[i]->GetProcessorID()).PrepareReschedule();
} }
} }
} // Anonymous namespace } // Anonymous namespace
@ -173,7 +172,7 @@ ResultCode AddressArbiter::WaitForAddressImpl(VAddr address, s64 timeout) {
current_thread->WakeAfterDelay(timeout); current_thread->WakeAfterDelay(timeout);
system.CpuCore(current_thread->GetProcessorID()).PrepareReschedule(); system.PrepareReschedule(current_thread->GetProcessorID());
return RESULT_TIMEOUT; return RESULT_TIMEOUT;
} }

49
src/core/hle/kernel/svc.cpp
View File

@ -516,7 +516,7 @@ static ResultCode WaitSynchronization(Core::System& system, Handle* index, VAddr
thread->WakeAfterDelay(nano_seconds); thread->WakeAfterDelay(nano_seconds);
thread->SetWakeupCallback(DefaultThreadWakeupCallback); thread->SetWakeupCallback(DefaultThreadWakeupCallback);
system.CpuCore(thread->GetProcessorID()).PrepareReschedule(); system.PrepareReschedule(thread->GetProcessorID());
return RESULT_TIMEOUT; return RESULT_TIMEOUT;
} }
@ -534,8 +534,7 @@ static ResultCode CancelSynchronization(Core::System& system, Handle thread_hand
} }
thread->CancelWait(); thread->CancelWait();
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
@ -1069,8 +1068,7 @@ static ResultCode SetThreadActivity(Core::System& system, Handle handle, u32 act
thread->SetActivity(static_cast<ThreadActivity>(activity)); thread->SetActivity(static_cast<ThreadActivity>(activity));
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
@ -1152,8 +1150,7 @@ static ResultCode SetThreadPriority(Core::System& system, Handle handle, u32 pri
thread->SetPriority(priority); thread->SetPriority(priority);
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
@ -1509,8 +1506,7 @@ static ResultCode CreateThread(Core::System& system, Handle* out_handle, VAddr e
thread->SetName( thread->SetName(
fmt::format("thread[entry_point={:X}, handle={:X}]", entry_point, *new_thread_handle)); fmt::format("thread[entry_point={:X}, handle={:X}]", entry_point, *new_thread_handle));
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
@ -1532,10 +1528,7 @@ static ResultCode StartThread(Core::System& system, Handle thread_handle) {
thread->ResumeFromWait(); thread->ResumeFromWait();
if (thread->GetStatus() == ThreadStatus::Ready) { if (thread->GetStatus() == ThreadStatus::Ready) {
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
else
Core::System::GetInstance().GlobalScheduler().SetReselectionPending();
} }
return RESULT_SUCCESS; return RESULT_SUCCESS;
@ -1582,10 +1575,7 @@ static void SleepThread(Core::System& system, s64 nanoseconds) {
current_thread->Sleep(nanoseconds); current_thread->Sleep(nanoseconds);
} }
// Reschedule all CPU cores system.PrepareReschedule(current_thread->GetProcessorID());
for (std::size_t i = 0; i < Core::NUM_CPU_CORES; ++i) {
system.CpuCore(i).PrepareReschedule();
}
} }
/// Wait process wide key atomic /// Wait process wide key atomic
@ -1632,7 +1622,7 @@ static ResultCode WaitProcessWideKeyAtomic(Core::System& system, VAddr mutex_add
// Note: Deliberately don't attempt to inherit the lock owner's priority. // Note: Deliberately don't attempt to inherit the lock owner's priority.
system.CpuCore(current_thread->GetProcessorID()).PrepareReschedule(); system.PrepareReschedule(current_thread->GetProcessorID());
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
@ -1644,7 +1634,7 @@ static ResultCode SignalProcessWideKey(Core::System& system, VAddr condition_var
// Retrieve a list of all threads that are waiting for this condition variable. // Retrieve a list of all threads that are waiting for this condition variable.
std::vector<SharedPtr<Thread>> waiting_threads; std::vector<SharedPtr<Thread>> waiting_threads;
const auto& scheduler = Core::System::GetInstance().GlobalScheduler(); const auto& scheduler = system.GlobalScheduler();
const auto& thread_list = scheduler.GetThreadList(); const auto& thread_list = scheduler.GetThreadList();
for (const auto& thread : thread_list) { for (const auto& thread : thread_list) {
@ -1706,8 +1696,7 @@ static ResultCode SignalProcessWideKey(Core::System& system, VAddr condition_var
thread->SetLockOwner(nullptr); thread->SetLockOwner(nullptr);
thread->SetMutexWaitAddress(0); thread->SetMutexWaitAddress(0);
thread->SetWaitHandle(0); thread->SetWaitHandle(0);
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
} else { } else {
// Atomically signal that the mutex now has a waiting thread. // Atomically signal that the mutex now has a waiting thread.
do { do {
@ -1731,8 +1720,7 @@ static ResultCode SignalProcessWideKey(Core::System& system, VAddr condition_var
thread->SetStatus(ThreadStatus::WaitMutex); thread->SetStatus(ThreadStatus::WaitMutex);
owner->AddMutexWaiter(thread); owner->AddMutexWaiter(thread);
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
} }
} }
@ -1758,13 +1746,10 @@ static ResultCode WaitForAddress(Core::System& system, VAddr address, u32 type,
} }
const auto arbitration_type = static_cast<AddressArbiter::ArbitrationType>(type); const auto arbitration_type = static_cast<AddressArbiter::ArbitrationType>(type);
auto& address_arbiter = auto& address_arbiter = system.Kernel().CurrentProcess()->GetAddressArbiter();
system.Kernel().CurrentProcess()->GetAddressArbiter();
ResultCode result = address_arbiter.WaitForAddress(address, arbitration_type, value, timeout); ResultCode result = address_arbiter.WaitForAddress(address, arbitration_type, value, timeout);
if (result == RESULT_SUCCESS) if (result == RESULT_SUCCESS)
Core::System::GetInstance() system.PrepareReschedule();
.CpuCore(GetCurrentThread()->GetProcessorID())
.PrepareReschedule();
return result; return result;
} }
@ -2051,10 +2036,10 @@ static ResultCode SetThreadCoreMask(Core::System& system, Handle thread_handle,
return ERR_INVALID_HANDLE; return ERR_INVALID_HANDLE;
} }
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule(); system.PrepareReschedule(thread->GetProcessorID());
thread->ChangeCore(core, affinity_mask); thread->ChangeCore(core, affinity_mask);
if (thread->GetProcessorID() >= 0) system.PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
@ -2165,7 +2150,7 @@ static ResultCode SignalEvent(Core::System& system, Handle handle) {
} }
writable_event->Signal(); writable_event->Signal();
Core::System::GetInstance().PrepareReschedule(); system.PrepareReschedule();
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }

3
src/core/hle/kernel/wait_object.cpp
View File

@ -97,8 +97,7 @@ void WaitObject::WakeupWaitingThread(SharedPtr<Thread> thread) {
} }
if (resume) { if (resume) {
thread->ResumeFromWait(); thread->ResumeFromWait();
if (thread->GetProcessorID() >= 0) Core::System::GetInstance().PrepareReschedule(thread->GetProcessorID());
Core::System::GetInstance().CpuCore(thread->GetProcessorID()).PrepareReschedule();
} }
} }