KyberHydra/Ryujinx
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Fix a specific core migration bug on the scheduler (#2271)

Browse source
This commit is contained in:
gdkchan 2021-05-11 13:18:50 -03:00 committed by GitHub
parent 701c427659
commit ebdbaa6db0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs
View file

@ -22,8 +22,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
private struct SchedulingState private struct SchedulingState
{ {
public bool NeedsScheduling; public volatile bool NeedsScheduling;
public KThread SelectedThread; public volatile KThread SelectedThread;
} }
private SchedulingState _state; private SchedulingState _state;
@ -349,31 +349,29 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
nextThread ??= _idleThread; nextThread ??= _idleThread;
if (currentThread == nextThread) if (currentThread != nextThread)
{ {
return; long previousTicks = LastContextSwitchTime;
} long currentTicks = PerformanceCounter.ElapsedTicks;
long ticksDelta = currentTicks - previousTicks;
long previousTicks = LastContextSwitchTime; currentThread.AddCpuTime(ticksDelta);
long currentTicks = PerformanceCounter.ElapsedTicks;
long ticksDelta = currentTicks - previousTicks;
currentThread.AddCpuTime(ticksDelta); if (currentProcess != null)
{
currentProcess.AddCpuTime(ticksDelta);
}
if (currentProcess != null) LastContextSwitchTime = currentTicks;
{
currentProcess.AddCpuTime(ticksDelta);
}
LastContextSwitchTime = currentTicks; if (currentProcess != null)
{
if (currentProcess != null) _previousThread = !currentThread.TerminationRequested && currentThread.ActiveCore == _coreId ? currentThread : null;
{ }
_previousThread = !currentThread.TerminationRequested && currentThread.ActiveCore == _coreId ? currentThread : null; else if (currentThread == _idleThread)
} {
else if (currentThread == _idleThread) _previousThread = null;
{ }
_previousThread = null;
} }
if (nextThread.CurrentCore != _coreId) if (nextThread.CurrentCore != _coreId)
@ -469,6 +467,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
{ {
KThread currentThread = KernelStatic.GetCurrentThread(); KThread currentThread = KernelStatic.GetCurrentThread();
if (!currentThread.IsSchedulable)
{
return;
}
context.CriticalSection.Enter(); context.CriticalSection.Enter();
if (currentThread.SchedFlags != ThreadSchedState.Running) if (currentThread.SchedFlags != ThreadSchedState.Running)
@ -491,6 +494,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
{ {
KThread currentThread = KernelStatic.GetCurrentThread(); KThread currentThread = KernelStatic.GetCurrentThread();
if (!currentThread.IsSchedulable)
{
return;
}
context.CriticalSection.Enter(); context.CriticalSection.Enter();
if (currentThread.SchedFlags != ThreadSchedState.Running) if (currentThread.SchedFlags != ThreadSchedState.Running)
@ -550,6 +558,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
{ {
KThread currentThread = KernelStatic.GetCurrentThread(); KThread currentThread = KernelStatic.GetCurrentThread();
if (!currentThread.IsSchedulable)
{
return;
}
context.CriticalSection.Enter(); context.CriticalSection.Enter();
if (currentThread.SchedFlags != ThreadSchedState.Running) if (currentThread.SchedFlags != ThreadSchedState.Running)