Revert TranslatorCache impl to the more performant one, fix a few issues with it

ChocolArm64/TranslatorCache.cs

@@ -1,7 +1,7 @@
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
@@ -10,54 +10,76 @@ namespace ChocolArm64
     class TranslatorCache
     {
         //Maximum size of the cache, the unit used is completely arbitrary.
-        private const int MaxTotalSize = 0x100000;
+        private const int MaxTotalSize = 0x800000;
 
         //Minimum time required in milliseconds for a method to be eligible for deletion.
         private const int MinTimeDelta = 2 * 60000;
 
+        //Minimum number of calls required to update the timestamp.
+        private const int MinCallCountForUpdate = 250;
+
         private class CacheBucket
         {
             public TranslatedSub Subroutine { get; private set; }
 
+            public LinkedListNode<long> Node { get; private set; }
+
+            public int CallCount { get; set; }
+
             public int Size { get; private set; }
 
             public long Timestamp { get; private set; }
 
-            public CacheBucket(TranslatedSub subroutine, int size)
+            public CacheBucket(TranslatedSub subroutine, LinkedListNode<long> node, int size)
             {
                 Subroutine = subroutine;
                 Size       = size;
+
+                UpdateNode(node);
             }
 
-            public void UpdateTimestamp()
+            public void UpdateNode(LinkedListNode<long> node)
             {
+                Node = node;
+
                 Timestamp = GetTimestamp();
             }
         }
 
         private ConcurrentDictionary<long, CacheBucket> _cache;
 
+        private LinkedList<long> _sortedCache;
+
         private int _totalSize;
 
         public TranslatorCache()
         {
             _cache = new ConcurrentDictionary<long, CacheBucket>();
+
+            _sortedCache = new LinkedList<long>();
         }
 
         public void AddOrUpdate(long position, TranslatedSub subroutine, int size)
         {
             ClearCacheIfNeeded();
 
-            CacheBucket newBucket = new CacheBucket(subroutine, size);
+            lock (_sortedCache)
-
-            _cache.AddOrUpdate(position, newBucket, (key, oldBucket) =>
             {
-                Interlocked.Add(ref _totalSize, -oldBucket.Size);
+                _totalSize += size;
 
-                return newBucket;
+                LinkedListNode<long> node = _sortedCache.AddLast(position);
-            });
 
-            Interlocked.Add(ref _totalSize, size);
+                CacheBucket newBucket = new CacheBucket(subroutine, node, size);
+
+                _cache.AddOrUpdate(position, newBucket, (key, bucket) =>
+                {
+                    _totalSize -= bucket.Size;
+
+                    _sortedCache.Remove(bucket.Node);
+
+                    return newBucket;
+                });
+            }
         }
 
         public bool HasSubroutine(long position)
@@ -70,7 +92,31 @@ namespace ChocolArm64
         {
             if (_cache.TryGetValue(position, out CacheBucket bucket))
             {
-                bucket.UpdateTimestamp();
+                if (bucket.CallCount++ > MinCallCountForUpdate)
+                {
+                    if (Monitor.TryEnter(_sortedCache))
+                    {
+                        try
+                        {
+                            //The bucket value on the dictionary may have changed between the
+                            //time we get the value from the dictionary, and we acquire the
+                            //lock. So we need to ensure we are working with the latest value,
+                            //we can do that by getting the value again, inside the lock.
+                            if (_cache.TryGetValue(position, out CacheBucket latestBucket))
+                            {
+                                latestBucket.CallCount = 0;
+
+                                _sortedCache.Remove(latestBucket.Node);
+
+                                latestBucket.UpdateNode(_sortedCache.AddLast(position));
+                            }
+                        }
+                        finally
+                        {
+                            Monitor.Exit(_sortedCache);
+                        }
+                    }
+                }
 
                 subroutine = bucket.Subroutine;
 
@@ -84,32 +130,34 @@ namespace ChocolArm64
 
         private void ClearCacheIfNeeded()
         {
-            if (_totalSize <= MaxTotalSize)
-            {
-                return;
-            }
-
             long timestamp = GetTimestamp();
 
-            foreach (KeyValuePair<long, CacheBucket> kv in _cache.OrderBy(x => (ulong)x.Value.Timestamp))
+            while (_totalSize > MaxTotalSize)
             {
-                CacheBucket bucket = kv.Value;
+                lock (_sortedCache)
-
-                long timeDelta = timestamp - bucket.Timestamp;
-
-                if (timeDelta <= MinTimeDelta)
                 {
-                    break;
+                    LinkedListNode<long> node = _sortedCache.First;
-                }
 
-                if (_cache.Remove(kv.Key, out bucket))
+                    if (node == null)
-                {
+                    {
-                    Interlocked.Add(ref _totalSize, -bucket.Size);
+                        break;
-                }
+                    }
 
-                if (_totalSize <= MaxTotalSize)
+                    CacheBucket bucket = _cache[node.Value];
-                {
+
-                    break;
+                    long timeDelta = timestamp - bucket.Timestamp;
+
+                    if (timeDelta <= MinTimeDelta)
+                    {
+                        break;
+                    }
+
+                    if (_cache.TryRemove(node.Value, out bucket))
+                    {
+                        _totalSize -= bucket.Size;
+
+                        _sortedCache.Remove(bucket.Node);
+                    }
                 }
             }
         }