mirror of
https://github.com/GreemDev/Ryujinx
synced 2024-11-27 20:19:10 +01:00
7b040e51b0
* kernel: Fix sleep timing accuracy This commit corrects some mistake while comparing reversing of kernel 13.x with our own. WaitAndCheckScheduledObjects timing accuracy was also improved. * Make KTimeManager.WaitAndCheckScheduledObjects spin wait for sub milliseconds Fix performance regression on Pokemon Let's Go games and possibly others. * Address rip's comment * kernel: Fix issues with timeout of -1 (0xFFFFFFFF) Fixes possible hang on Pokemon DP and possibly others
181 lines
No EOL
5.7 KiB
C#
181 lines
No EOL
5.7 KiB
C#
using Ryujinx.Common;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
|
|
namespace Ryujinx.HLE.HOS.Kernel.Common
|
|
{
|
|
class KTimeManager : IDisposable
|
|
{
|
|
public static readonly long DefaultTimeIncrementNanoseconds = ConvertGuestTicksToNanoseconds(2);
|
|
|
|
private class WaitingObject
|
|
{
|
|
public IKFutureSchedulerObject Object { get; }
|
|
public long TimePoint { get; }
|
|
|
|
public WaitingObject(IKFutureSchedulerObject schedulerObj, long timePoint)
|
|
{
|
|
Object = schedulerObj;
|
|
TimePoint = timePoint;
|
|
}
|
|
}
|
|
|
|
private readonly KernelContext _context;
|
|
private readonly List<WaitingObject> _waitingObjects;
|
|
private AutoResetEvent _waitEvent;
|
|
private bool _keepRunning;
|
|
private long _enforceWakeupFromSpinWait;
|
|
|
|
public KTimeManager(KernelContext context)
|
|
{
|
|
_context = context;
|
|
_waitingObjects = new List<WaitingObject>();
|
|
_keepRunning = true;
|
|
|
|
Thread work = new Thread(WaitAndCheckScheduledObjects)
|
|
{
|
|
Name = "HLE.TimeManager"
|
|
};
|
|
|
|
work.Start();
|
|
}
|
|
|
|
public void ScheduleFutureInvocation(IKFutureSchedulerObject schedulerObj, long timeout)
|
|
{
|
|
long timePoint = PerformanceCounter.ElapsedTicks + ConvertNanosecondsToHostTicks(timeout);
|
|
|
|
lock (_context.CriticalSection.Lock)
|
|
{
|
|
_waitingObjects.Add(new WaitingObject(schedulerObj, timePoint));
|
|
|
|
if (timeout < 1000000)
|
|
{
|
|
Interlocked.Exchange(ref _enforceWakeupFromSpinWait, 1);
|
|
}
|
|
}
|
|
|
|
_waitEvent.Set();
|
|
}
|
|
|
|
public void UnscheduleFutureInvocation(IKFutureSchedulerObject schedulerObj)
|
|
{
|
|
lock (_context.CriticalSection.Lock)
|
|
{
|
|
_waitingObjects.RemoveAll(x => x.Object == schedulerObj);
|
|
}
|
|
}
|
|
|
|
private void WaitAndCheckScheduledObjects()
|
|
{
|
|
SpinWait spinWait = new SpinWait();
|
|
WaitingObject next;
|
|
|
|
using (_waitEvent = new AutoResetEvent(false))
|
|
{
|
|
while (_keepRunning)
|
|
{
|
|
lock (_context.CriticalSection.Lock)
|
|
{
|
|
Interlocked.Exchange(ref _enforceWakeupFromSpinWait, 0);
|
|
|
|
next = _waitingObjects.OrderBy(x => x.TimePoint).FirstOrDefault();
|
|
}
|
|
|
|
if (next != null)
|
|
{
|
|
long timePoint = PerformanceCounter.ElapsedTicks;
|
|
|
|
if (next.TimePoint > timePoint)
|
|
{
|
|
long ms = Math.Min((next.TimePoint - timePoint) / PerformanceCounter.TicksPerMillisecond, int.MaxValue);
|
|
|
|
if (ms > 0)
|
|
{
|
|
_waitEvent.WaitOne((int)ms);
|
|
}
|
|
else
|
|
{
|
|
while (Interlocked.Read(ref _enforceWakeupFromSpinWait) != 1 && PerformanceCounter.ElapsedTicks <= next.TimePoint)
|
|
{
|
|
if (spinWait.NextSpinWillYield)
|
|
{
|
|
Thread.Yield();
|
|
|
|
spinWait.Reset();
|
|
}
|
|
|
|
spinWait.SpinOnce();
|
|
}
|
|
|
|
spinWait.Reset();
|
|
}
|
|
}
|
|
|
|
bool timeUp = PerformanceCounter.ElapsedTicks >= next.TimePoint;
|
|
|
|
if (timeUp)
|
|
{
|
|
lock (_context.CriticalSection.Lock)
|
|
{
|
|
if (_waitingObjects.Remove(next))
|
|
{
|
|
next.Object.TimeUp();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
_waitEvent.WaitOne();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public static long ConvertNanosecondsToMilliseconds(long time)
|
|
{
|
|
time /= 1000000;
|
|
|
|
if ((ulong)time > int.MaxValue)
|
|
{
|
|
return int.MaxValue;
|
|
}
|
|
|
|
return time;
|
|
}
|
|
|
|
public static long ConvertMillisecondsToNanoseconds(long time)
|
|
{
|
|
return time * 1000000;
|
|
}
|
|
|
|
public static long ConvertNanosecondsToHostTicks(long ns)
|
|
{
|
|
long nsDiv = ns / 1000000000;
|
|
long nsMod = ns % 1000000000;
|
|
long tickDiv = PerformanceCounter.TicksPerSecond / 1000000000;
|
|
long tickMod = PerformanceCounter.TicksPerSecond % 1000000000;
|
|
|
|
long baseTicks = (nsMod * tickMod + PerformanceCounter.TicksPerSecond - 1) / 1000000000;
|
|
return (nsDiv * tickDiv) * 1000000000 + nsDiv * tickMod + nsMod * tickDiv + baseTicks;
|
|
}
|
|
|
|
public static long ConvertGuestTicksToNanoseconds(long ticks)
|
|
{
|
|
return (long)Math.Ceiling(ticks * (1000000000.0 / 19200000.0));
|
|
}
|
|
|
|
public static long ConvertHostTicksToTicks(long time)
|
|
{
|
|
return (long)((time / (double)PerformanceCounter.TicksPerSecond) * 19200000.0);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
_keepRunning = false;
|
|
_waitEvent?.Set();
|
|
}
|
|
}
|
|
} |