From c646638680f9b2dcc055ffbb280e970fcfe93aab Mon Sep 17 00:00:00 2001 From: gdk Date: Tue, 30 Aug 2022 22:15:16 -0300 Subject: [PATCH] Update several methods to use GetNode directly and avoid array allocations --- .../WindowsShared/PlaceholderManager.cs | 129 +++++++++++------- 1 file changed, 76 insertions(+), 53 deletions(-) diff --git a/Ryujinx.Memory/WindowsShared/PlaceholderManager.cs b/Ryujinx.Memory/WindowsShared/PlaceholderManager.cs index 1722d528..8624f817 100644 --- a/Ryujinx.Memory/WindowsShared/PlaceholderManager.cs +++ b/Ryujinx.Memory/WindowsShared/PlaceholderManager.cs @@ -89,9 +89,12 @@ namespace Ryujinx.Memory.WindowsShared lock (_mappings) { RangeNode node = _mappings.GetNode(new RangeNode(address, address + 1UL, default)); + RangeNode successorNode; - for (; node != null; node = node.Successor) + for (; node != null; node = successorNode) { + successorNode = node.Successor; + if (IsMapped(node.Value)) { if (!WindowsApi.UnmapViewOfFile2(WindowsApi.CurrentProcessHandle, (IntPtr)node.Start, 2)) @@ -372,25 +375,25 @@ namespace Ryujinx.Memory.WindowsShared ulong endAddress = address + size; ulong blockAddress = (ulong)owner.Pointer; ulong blockEnd = blockAddress + owner.Size; - var overlaps = new RangeNode[InitialOverlapsSize]; int unmappedCount = 0; lock (_mappings) { - int count = _mappings.GetNodes(address, endAddress, ref overlaps); + RangeNode node = _mappings.GetNode(new RangeNode(address, address + 1UL, default)); - if (count == 0) + if (node == null) { - // Nothing to coalesce if we no overlaps. + // Nothing to coalesce if we have no overlaps. return; } - RangeNode predecessor = overlaps[0].Predecessor; - RangeNode successor = overlaps[count - 1].Successor; + RangeNode predecessor = node.Predecessor; + RangeNode successor = null; - for (int index = 0; index < count; index++) + for (; node != null; node = successor) { - var overlap = overlaps[index]; + successor = node.Successor; + var overlap = node; if (!IsMapped(overlap.Value)) { @@ -400,6 +403,11 @@ namespace Ryujinx.Memory.WindowsShared _mappings.Remove(overlap); unmappedCount++; } + + if (node.End >= endAddress) + { + break; + } } if (predecessor != null && !IsMapped(predecessor.Value) && predecessor.Start >= blockAddress) @@ -469,46 +477,50 @@ namespace Ryujinx.Memory.WindowsShared ulong reprotectSize = (ulong)size; ulong endAddress = reprotectAddress + reprotectSize; - var overlaps = new RangeNode[InitialOverlapsSize]; - int count; + bool success = true; lock (_mappings) { - count = _mappings.GetNodes(reprotectAddress, endAddress, ref overlaps); - } + RangeNode node = _mappings.GetNode(new RangeNode(reprotectAddress, reprotectAddress + 1UL, default)); + RangeNode successorNode; - bool success = true; - - for (int index = 0; index < count; index++) - { - var overlap = overlaps[index]; - - ulong mappedAddress = overlap.Start; - ulong mappedSize = overlap.End - overlap.Start; - - if (mappedAddress < reprotectAddress) + for (; node != null; node = successorNode) { - ulong delta = reprotectAddress - mappedAddress; - mappedAddress = reprotectAddress; - mappedSize -= delta; - } + successorNode = node.Successor; + var overlap = node; - ulong mappedEndAddress = mappedAddress + mappedSize; + ulong mappedAddress = overlap.Start; + ulong mappedSize = overlap.End - overlap.Start; - if (mappedEndAddress > endAddress) - { - ulong delta = mappedEndAddress - endAddress; - mappedSize -= delta; - } - - if (!WindowsApi.VirtualProtect((IntPtr)mappedAddress, (IntPtr)mappedSize, WindowsApi.GetProtection(permission), out _)) - { - if (throwOnError) + if (mappedAddress < reprotectAddress) { - throw new WindowsApiException("VirtualProtect"); + ulong delta = reprotectAddress - mappedAddress; + mappedAddress = reprotectAddress; + mappedSize -= delta; } - success = false; + ulong mappedEndAddress = mappedAddress + mappedSize; + + if (mappedEndAddress > endAddress) + { + ulong delta = mappedEndAddress - endAddress; + mappedSize -= delta; + } + + if (!WindowsApi.VirtualProtect((IntPtr)mappedAddress, (IntPtr)mappedSize, WindowsApi.GetProtection(permission), out _)) + { + if (throwOnError) + { + throw new WindowsApiException("VirtualProtect"); + } + + success = false; + } + + if (node.End >= endAddress) + { + break; + } } } @@ -565,26 +577,27 @@ namespace Ryujinx.Memory.WindowsShared private void UpdateProtection(ulong address, ulong size, MemoryPermission permission) { ulong endAddress = address + size; - var overlaps = new RangeNode[InitialOverlapsSize]; - int count; lock (_protections) { - count = _protections.GetNodes(address, endAddress, ref overlaps); + RangeNode node = _protections.GetNode(new RangeNode(address, address + 1UL, default)); - if (count == 1 && - overlaps[0].Start <= address && - overlaps[0].End >= endAddress && - overlaps[0].Value == permission) + if (node != null && + node.Start <= address && + node.End >= endAddress && + node.Value == permission) { return; } + RangeNode successorNode; + ulong startAddress = address; - for (int index = 0; index < count; index++) + for (; node != null; node = successorNode) { - var protection = overlaps[index]; + successorNode = node.Successor; + var protection = node; ulong protAddress = protection.Start; ulong protEndAddress = protection.End; @@ -616,6 +629,11 @@ namespace Ryujinx.Memory.WindowsShared _protections.Add(new RangeNode(endAddress, protEndAddress, protPermission)); } } + + if (node.End >= endAddress) + { + break; + } } _protections.Add(new RangeNode(startAddress, endAddress, permission)); @@ -630,16 +648,16 @@ namespace Ryujinx.Memory.WindowsShared private void RemoveProtection(ulong address, ulong size) { ulong endAddress = address + size; - var overlaps = new RangeNode[InitialOverlapsSize]; - int count; lock (_protections) { - count = _protections.GetNodes(address, endAddress, ref overlaps); + RangeNode node = _protections.GetNode(new RangeNode(address, address + 1UL, default)); + RangeNode successorNode; - for (int index = 0; index < count; index++) + for (; node != null; node = successorNode) { - var protection = overlaps[index]; + successorNode = node.Successor; + var protection = node; ulong protAddress = protection.Start; ulong protEndAddress = protection.End; @@ -656,6 +674,11 @@ namespace Ryujinx.Memory.WindowsShared { _protections.Add(new RangeNode(endAddress, protEndAddress, protPermission)); } + + if (node.End >= endAddress) + { + break; + } } } }