48278905d1
* Rewrite scheduler context switch code * Fix race in UnmapIpcRestorePermission * Fix thread exit issue that could leave the scheduler in a invalid state * Change context switch method to not wait on guest thread, remove spin wait, use SignalAndWait to pass control * Remove multi-core setting (it is always on now) * Re-enable assert * Remove multicore from default config and schema * Fix race in KTimeManager
137 lines
No EOL
3.9 KiB
C#
137 lines
No EOL
3.9 KiB
C#
using Ryujinx.HLE.HOS.Kernel.Common;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
|
|
namespace Ryujinx.HLE.HOS.Kernel.Threading
|
|
{
|
|
class KSynchronization
|
|
{
|
|
private KernelContext _context;
|
|
|
|
public KSynchronization(KernelContext context)
|
|
{
|
|
_context = context;
|
|
}
|
|
|
|
public KernelResult WaitFor(Span<KSynchronizationObject> syncObjs, long timeout, out int handleIndex)
|
|
{
|
|
handleIndex = 0;
|
|
|
|
KernelResult result = KernelResult.TimedOut;
|
|
|
|
_context.CriticalSection.Enter();
|
|
|
|
// Check if objects are already signaled before waiting.
|
|
for (int index = 0; index < syncObjs.Length; index++)
|
|
{
|
|
if (!syncObjs[index].IsSignaled())
|
|
{
|
|
continue;
|
|
}
|
|
|
|
handleIndex = index;
|
|
|
|
_context.CriticalSection.Leave();
|
|
|
|
return KernelResult.Success;
|
|
}
|
|
|
|
if (timeout == 0)
|
|
{
|
|
_context.CriticalSection.Leave();
|
|
|
|
return result;
|
|
}
|
|
|
|
KThread currentThread = KernelStatic.GetCurrentThread();
|
|
|
|
if (currentThread.ShallBeTerminated ||
|
|
currentThread.SchedFlags == ThreadSchedState.TerminationPending)
|
|
{
|
|
result = KernelResult.ThreadTerminating;
|
|
}
|
|
else if (currentThread.SyncCancelled)
|
|
{
|
|
currentThread.SyncCancelled = false;
|
|
|
|
result = KernelResult.Cancelled;
|
|
}
|
|
else
|
|
{
|
|
LinkedListNode<KThread>[] syncNodes = new LinkedListNode<KThread>[syncObjs.Length];
|
|
|
|
for (int index = 0; index < syncObjs.Length; index++)
|
|
{
|
|
syncNodes[index] = syncObjs[index].AddWaitingThread(currentThread);
|
|
}
|
|
|
|
currentThread.WaitingSync = true;
|
|
currentThread.SignaledObj = null;
|
|
currentThread.ObjSyncResult = result;
|
|
|
|
currentThread.Reschedule(ThreadSchedState.Paused);
|
|
|
|
if (timeout > 0)
|
|
{
|
|
_context.TimeManager.ScheduleFutureInvocation(currentThread, timeout);
|
|
}
|
|
|
|
_context.CriticalSection.Leave();
|
|
|
|
currentThread.WaitingSync = false;
|
|
|
|
if (timeout > 0)
|
|
{
|
|
_context.TimeManager.UnscheduleFutureInvocation(currentThread);
|
|
}
|
|
|
|
_context.CriticalSection.Enter();
|
|
|
|
result = currentThread.ObjSyncResult;
|
|
|
|
handleIndex = -1;
|
|
|
|
for (int index = 0; index < syncObjs.Length; index++)
|
|
{
|
|
syncObjs[index].RemoveWaitingThread(syncNodes[index]);
|
|
|
|
if (syncObjs[index] == currentThread.SignaledObj)
|
|
{
|
|
handleIndex = index;
|
|
}
|
|
}
|
|
}
|
|
|
|
_context.CriticalSection.Leave();
|
|
|
|
return result;
|
|
}
|
|
|
|
public void SignalObject(KSynchronizationObject syncObj)
|
|
{
|
|
_context.CriticalSection.Enter();
|
|
|
|
if (syncObj.IsSignaled())
|
|
{
|
|
LinkedListNode<KThread> node = syncObj.WaitingThreads.First;
|
|
|
|
while (node != null)
|
|
{
|
|
KThread thread = node.Value;
|
|
|
|
if ((thread.SchedFlags & ThreadSchedState.LowMask) == ThreadSchedState.Paused)
|
|
{
|
|
thread.SignaledObj = syncObj;
|
|
thread.ObjSyncResult = KernelResult.Success;
|
|
|
|
thread.Reschedule(ThreadSchedState.Running);
|
|
}
|
|
|
|
node = node.Next;
|
|
}
|
|
}
|
|
|
|
_context.CriticalSection.Leave();
|
|
}
|
|
}
|
|
} |