IDisposable, no closure in GetOrAdd, Evicter debounce, fixes #1

Author: alex-jitbit

FastCache.Benchmarks/Program.cs

@@ -41,6 +41,15 @@ public void MemoryCacheLookup()
 		x = MemoryCache.Default["test987"];
 	}
 
+	[Benchmark]
+	public void FastCacheGetOrAdd()
+	{
+		_cache.GetOrAdd("test123", k => 123, TimeSpan.FromSeconds(1));
+		_cache.GetOrAdd("test234", k => 124, TimeSpan.FromSeconds(1));
+		_cache.GetOrAdd("test673", k => 125, TimeSpan.FromSeconds(1));
+		_cache.GetOrAdd("test987", k => 126, TimeSpan.FromSeconds(1));
+	}
+
 	[Benchmark]
 	public void FastCacheAddRemove()
 	{

FastCache/FastCache.cs

@@ -9,7 +9,7 @@ namespace Jitbit.Utils
 	/// <summary>
 	/// faster MemoryCache alternative. basically a concurrent dictionary with expiration
 	/// </summary>
-	public class FastCache<TKey, TValue> : IEnumerable<KeyValuePair<TKey, TValue>>
+	public class FastCache<TKey, TValue> : IEnumerable<KeyValuePair<TKey, TValue>>, IDisposable
 	{
 		private readonly ConcurrentDictionary<TKey, TtlValue> _dict = new ConcurrentDictionary<TKey, TtlValue>();
 
@@ -25,10 +25,21 @@ public FastCache(int cleanupJobInterval = 10000)
 
 			void _EvictExpired(object state)
 			{
-				foreach (var p in _dict)
+				//overlapped execution? forget it, lets move on
+				if (Monitor.TryEnter(this))
 				{
-					if (p.Value.IsExpired())
-						_dict.TryRemove(p.Key, out _);
+					try
+					{
+						foreach (var p in _dict)
+						{
+							if (p.Value.IsExpired())
+								_dict.TryRemove(p.Key, out _);
+						}
+					}
+					finally
+					{
+						Monitor.Exit(this);
+					}
 				}
 			}
 		}
@@ -137,7 +148,7 @@ public TValue GetOrAdd(TKey key, Func<TKey, TValue> valueFactory, TimeSpan ttl)
 			if (TryGet(key, out var value))
 				return value;
 
-			return _dict.GetOrAdd(key, k => new TtlValue(valueFactory(key), ttl)).Value;
+			return _dict.GetOrAdd(key, (k, v) => new TtlValue(valueFactory(k), v), ttl).Value;
 		}
 
 		/// <summary>
@@ -180,5 +191,19 @@ public bool IsExpired()
 				return difference > 0;
 			}
 		}
+
+		//IDispisable members
+		private bool _disposedValue;
+		public void Dispose() => Dispose(true);
+		protected virtual void Dispose(bool disposing)
+		{
+			if (!_disposedValue)
+			{
+				if (disposing)
+					_cleanUpTimer.Dispose();
+
+				_disposedValue = true;
+			}
+		}
 	}
 }