deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Call syncpoint expiration callback outside of the lock (#1349)

Browse source
This commit is contained in:
gdkchan 2020-07-03 19:22:06 -03:00 committed by GitHub
parent c70056bc76
commit 302d0f830c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
Ryujinx.Graphics.Gpu/Synchronization/Syncpoint.cs
View file

@ -13,16 +13,13 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
public readonly uint Id; public readonly uint Id;
// TODO: get rid of this lock
private object _listLock = new object();
/// <summary> /// <summary>
/// The value of the syncpoint. /// The value of the syncpoint.
/// </summary> /// </summary>
public uint Value => (uint)_storedValue; public uint Value => (uint)_storedValue;
// TODO: switch to something handling concurrency? // TODO: switch to something handling concurrency?
private List<SyncpointWaiterHandle> _waiters; private readonly List<SyncpointWaiterHandle> _waiters;
public Syncpoint(uint id) public Syncpoint(uint id)
{ {
@ -39,7 +36,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
/// <returns>The created SyncpointWaiterHandle object or null if already past threshold</returns> /// <returns>The created SyncpointWaiterHandle object or null if already past threshold</returns>
public SyncpointWaiterHandle RegisterCallback(uint threshold, Action callback) public SyncpointWaiterHandle RegisterCallback(uint threshold, Action callback)
{ {
lock (_listLock) lock (_waiters)
{ {
if (Value >= threshold) if (Value >= threshold)
{ {
@ -64,7 +61,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
public void UnregisterCallback(SyncpointWaiterHandle waiterInformation) public void UnregisterCallback(SyncpointWaiterHandle waiterInformation)
{ {
lock (_listLock) lock (_waiters)
{ {
_waiters.Remove(waiterInformation); _waiters.Remove(waiterInformation);
} }
@ -78,7 +75,10 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
{ {
uint currentValue = (uint)Interlocked.Increment(ref _storedValue); uint currentValue = (uint)Interlocked.Increment(ref _storedValue);
lock (_listLock) SyncpointWaiterHandle expired = null;
List<SyncpointWaiterHandle> expiredList = null;
lock (_waiters)
{ {
_waiters.RemoveAll(item => _waiters.RemoveAll(item =>
{ {
@ -86,13 +86,42 @@ namespace Ryujinx.Graphics.Gpu.Synchronization
if (isPastThreshold) if (isPastThreshold)
{ {
item.Callback(); if (expired == null)
{
expired = item;
}
else
{
if (expiredList == null)
{
expiredList = new List<SyncpointWaiterHandle>();
}
expiredList.Add(item);
}
} }
return isPastThreshold; return isPastThreshold;
}); });
} }
// Call the callbacks as a separate step.
// As we don't know what the callback will be doing,
// and it could block execution for a indefinite amount of time,
// we can't call it inside the lock.
if (expired != null)
{
expired.Callback();
if (expiredList != null)
{
for (int i = 0; i < expiredList.Count; i++)
{
expiredList[i].Callback();
}
}
}
return currentValue; return currentValue;
} }
} }