diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2020-07-03 19:22:06 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-04 00:22:06 +0200 |
| commit | 302d0f830c903c60b0859cecc9cb304c365ca987 (patch) | |
| tree | 0147ce6badc87320f83176c168c8eba36e82f452 | |
| parent | c70056bc76096a9d468cafdc599de4fbbc9b1aa1 (diff) | |
Call syncpoint expiration callback outside of the lock (#1349)
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Synchronization/Syncpoint.cs | 45 |
1 files changed, 37 insertions, 8 deletions
diff --git a/Ryujinx.Graphics.Gpu/Synchronization/Syncpoint.cs b/Ryujinx.Graphics.Gpu/Synchronization/Syncpoint.cs index abd86b35..30f8cc86 100644 --- a/Ryujinx.Graphics.Gpu/Synchronization/Syncpoint.cs +++ b/Ryujinx.Graphics.Gpu/Synchronization/Syncpoint.cs @@ -13,16 +13,13 @@ namespace Ryujinx.Graphics.Gpu.Synchronization public readonly uint Id; - // TODO: get rid of this lock - private object _listLock = new object(); - /// <summary> /// The value of the syncpoint. /// </summary> public uint Value => (uint)_storedValue; // TODO: switch to something handling concurrency? - private List<SyncpointWaiterHandle> _waiters; + private readonly List<SyncpointWaiterHandle> _waiters; 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> public SyncpointWaiterHandle RegisterCallback(uint threshold, Action callback) { - lock (_listLock) + lock (_waiters) { if (Value >= threshold) { @@ -64,7 +61,7 @@ namespace Ryujinx.Graphics.Gpu.Synchronization public void UnregisterCallback(SyncpointWaiterHandle waiterInformation) { - lock (_listLock) + lock (_waiters) { _waiters.Remove(waiterInformation); } @@ -78,7 +75,10 @@ namespace Ryujinx.Graphics.Gpu.Synchronization { uint currentValue = (uint)Interlocked.Increment(ref _storedValue); - lock (_listLock) + SyncpointWaiterHandle expired = null; + List<SyncpointWaiterHandle> expiredList = null; + + lock (_waiters) { _waiters.RemoveAll(item => { @@ -86,13 +86,42 @@ namespace Ryujinx.Graphics.Gpu.Synchronization if (isPastThreshold) { - item.Callback(); + if (expired == null) + { + expired = item; + } + else + { + if (expiredList == null) + { + expiredList = new List<SyncpointWaiterHandle>(); + } + + expiredList.Add(item); + } } 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; } } |