diff options
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs index d9b2c039..d02e25a3 100644 --- a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs +++ b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs @@ -791,19 +791,16 @@ namespace Ryujinx.HLE.HOS.Kernel.Process private void InterruptHandler(object sender, EventArgs e) { KernelContext.Scheduler.ContextSwitch(); + KernelContext.Scheduler.GetCurrentThread().HandlePostSyscall(); } public void IncrementThreadCount() { Interlocked.Increment(ref _threadCount); - - KernelContext.ThreadCounter.AddCount(); } public void DecrementThreadCountAndTerminateIfZero() { - KernelContext.ThreadCounter.Signal(); - if (Interlocked.Decrement(ref _threadCount) == 0) { Terminate(); @@ -812,8 +809,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Process public void DecrementToZeroWhileTerminatingCurrent() { - KernelContext.ThreadCounter.Signal(); - while (Interlocked.Decrement(ref _threadCount) != 0) { Destroy(); @@ -1000,24 +995,29 @@ namespace Ryujinx.HLE.HOS.Kernel.Process KernelContext.CriticalSection.Leave(); } - KThread blockedThread = null; - - lock (_threadingLock) + while (true) { - foreach (KThread thread in _threads) + KThread blockedThread = null; + + lock (_threadingLock) { - if (thread != currentThread && (thread.SchedFlags & ThreadSchedState.LowMask) != ThreadSchedState.TerminationPending) + foreach (KThread thread in _threads) { - thread.IncrementReferenceCount(); + if (thread != currentThread && (thread.SchedFlags & ThreadSchedState.LowMask) != ThreadSchedState.TerminationPending) + { + thread.IncrementReferenceCount(); - blockedThread = thread; - break; + blockedThread = thread; + break; + } } } - } - if (blockedThread != null) - { + if (blockedThread == null) + { + break; + } + blockedThread.Terminate(); blockedThread.DecrementReferenceCount(); } |