From cd6d9f9343f91c47a251df51703d67a80519b326 Mon Sep 17 00:00:00 2001
From: Mark Cilia Vincenti <markciliavincenti@gmail.com>
Date: Mon, 2 Jan 2023 08:50:55 +0100
Subject: [PATCH] Minor optimizations.

---
 AsyncKeyedLock/AsyncKeyedLock.csproj       |  8 +++----
 AsyncKeyedLock/AsyncKeyedLockDictionary.cs | 27 ++++++++--------------
 AsyncKeyedLock/AsyncKeyedLockPool.cs       |  6 ++---
 AsyncKeyedLock/AsyncKeyedLockReleaser.cs   |  8 ++++---
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/AsyncKeyedLock/AsyncKeyedLock.csproj b/AsyncKeyedLock/AsyncKeyedLock.csproj
index bf24ed5..ed3f6ec 100644
--- a/AsyncKeyedLock/AsyncKeyedLock.csproj
+++ b/AsyncKeyedLock/AsyncKeyedLock.csproj
@@ -8,16 +8,16 @@
 		<PackageProjectUrl>https://github.com/MarkCiliaVincenti/AsyncKeyedLock</PackageProjectUrl>
 		<Copyright>MIT</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<Version>6.0.4</Version>
+		<Version>6.0.5</Version>
 		<PackageIcon>logo.png</PackageIcon>
 		<PackageReleaseNotes>Optimizations and fixing of more rare race conditions.</PackageReleaseNotes>
 		<Description>An asynchronous .NET Standard 2.0 library that allows you to lock based on a key (keyed semaphores), limiting concurrent threads sharing the same key to a specified number.</Description>
-		<Copyright>© 2022 Mark Cilia Vincenti</Copyright>
+		<Copyright>© 2023 Mark Cilia Vincenti</Copyright>
 		<PackageTags>async,lock,key,keyed,semaphore,dictionary,pooling,duplicate,synchronization</PackageTags>
 		<RepositoryType>git</RepositoryType>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-		<AssemblyVersion>6.0.4.0</AssemblyVersion>
-		<FileVersion>6.0.4.0</FileVersion>
+		<AssemblyVersion>6.0.4.1</AssemblyVersion>
+		<FileVersion>6.0.4.1</FileVersion>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<IsPackable>true</IsPackable>
 		<IsTrimmable>true</IsTrimmable>
diff --git a/AsyncKeyedLock/AsyncKeyedLockDictionary.cs b/AsyncKeyedLock/AsyncKeyedLockDictionary.cs
index 122ae03..c72cb30 100644
--- a/AsyncKeyedLock/AsyncKeyedLockDictionary.cs
+++ b/AsyncKeyedLock/AsyncKeyedLockDictionary.cs
@@ -102,7 +102,7 @@ public AsyncKeyedLockReleaser<TKey> GetOrAdd(TKey key)
                     }
                     if (releaser.TryIncrement(key))
                     {
-                        releaser.IsPooled = true;
+                        releaser.IsNotInUse = true;
                         _pool.PutObject(releaserToAdd);
                         return releaser;
                     }
@@ -135,24 +135,20 @@ public void Release(AsyncKeyedLockReleaser<TKey> releaser)
         {
             Monitor.Enter(releaser);
 
-            if (--releaser.ReferenceCount == 0)
+            if (releaser.ReferenceCount == 1)
             {
                 TryRemove(releaser.Key, out _);
+                releaser.IsNotInUse = true;
+                Monitor.Exit(releaser);
                 if (PoolingEnabled)
                 {
-                    releaser.IsPooled = true;
-                    Monitor.Exit(releaser);
-                    releaser.ReferenceCount = 1;
                     _pool.PutObject(releaser);
                 }
-                else
-                {
-                    Monitor.Exit(releaser);
-                }
                 releaser.SemaphoreSlim.Release();
                 return;
             }
 
+            --releaser.ReferenceCount;
             Monitor.Exit(releaser);
             releaser.SemaphoreSlim.Release();
         }
@@ -162,23 +158,18 @@ public void ReleaseWithoutSemaphoreRelease(AsyncKeyedLockReleaser<TKey> releaser
         {
             Monitor.Enter(releaser);
 
-            if (--releaser.ReferenceCount == 0)
+            if (releaser.ReferenceCount == 1)
             {
                 TryRemove(releaser.Key, out _);
+                releaser.IsNotInUse = true;
+                Monitor.Exit(releaser);
                 if (PoolingEnabled)
                 {
-                    releaser.IsPooled = true;
-                    Monitor.Exit(releaser);
-                    releaser.ReferenceCount = 1;
                     _pool.PutObject(releaser);
                 }
-                else
-                {
-                    Monitor.Exit(releaser);
-                }
                 return;
             }
-
+            --releaser.ReferenceCount;
             Monitor.Exit(releaser);
         }
     }
diff --git a/AsyncKeyedLock/AsyncKeyedLockPool.cs b/AsyncKeyedLock/AsyncKeyedLockPool.cs
index d963b47..6450338 100644
--- a/AsyncKeyedLock/AsyncKeyedLockPool.cs
+++ b/AsyncKeyedLock/AsyncKeyedLockPool.cs
@@ -18,7 +18,7 @@ public AsyncKeyedLockPool(Func<TKey, AsyncKeyedLockReleaser<TKey>> objectGenerat
                 for (int i = 0; i < capacity; ++i)
                 {
                     var releaser = _objectGenerator(default);
-                    releaser.IsPooled = true;
+                    releaser.IsNotInUse = true;
                     _objects.Add(releaser);
                 }
             }
@@ -28,7 +28,7 @@ public AsyncKeyedLockPool(Func<TKey, AsyncKeyedLockReleaser<TKey>> objectGenerat
                 for (int i = 0; i < initialFill; ++i)
                 {
                     var releaser = _objectGenerator(default);
-                    releaser.IsPooled = true;
+                    releaser.IsNotInUse = true;
                     _objects.Add(releaser);
                 }
             }
@@ -40,7 +40,7 @@ public AsyncKeyedLockReleaser<TKey> GetObject(TKey key)
             if (_objects.TryTake(out var item))
             {
                 item.Key = key;
-                item.IsPooled = false;
+                item.IsNotInUse = false;
                 return item;
             }
             return _objectGenerator(key);
diff --git a/AsyncKeyedLock/AsyncKeyedLockReleaser.cs b/AsyncKeyedLock/AsyncKeyedLockReleaser.cs
index 6917b43..86d9ab9 100644
--- a/AsyncKeyedLock/AsyncKeyedLockReleaser.cs
+++ b/AsyncKeyedLock/AsyncKeyedLockReleaser.cs
@@ -9,7 +9,7 @@ namespace AsyncKeyedLock
     /// </summary>
     public sealed class AsyncKeyedLockReleaser<TKey> : IDisposable
     {
-        internal bool IsPooled { get; set; } = false;
+        internal bool IsNotInUse { get; set; } = false;
 
         private TKey _key;
 
@@ -54,7 +54,7 @@ internal bool TryIncrement(TKey key)
         {
             if (Monitor.TryEnter(this))
             {
-                if (IsPooled || !_key.Equals(key)) // rare race condition
+                if (IsNotInUse || !_key.Equals(key)) // rare race condition
                 {
                     Monitor.Exit(this);
                     return false;
@@ -71,7 +71,7 @@ internal bool TryIncrementNoPooling()
         {
             if (Monitor.TryEnter(this))
             {
-                if (_referenceCount == 0) // rare race condition
+                if (IsNotInUse) // rare race condition
                 {
                     Monitor.Exit(this);
                     return false;
@@ -86,11 +86,13 @@ internal bool TryIncrementNoPooling()
         /// <summary>
         /// Releases the <see cref="SemaphoreSlim"/> object once.
         /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Dispose()
         {
             _dictionary.Release(this);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void Dispose(bool enteredSemaphore)
         {
             if (enteredSemaphore)