.NET 9

Author: usercode

src/AsyncKeyLock.Benchmarks/AsyncKeyLock.Benchmarks.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AsyncKeyedLock" Version="6.3.4" />
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="AsyncKeyedLock" Version="7.1.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageReference Include="NeoSmart.AsyncLock" Version="3.2.1" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.1" />
+    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>

src/AsyncKeyLock.Tests/AsyncKeyLock.Tests.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

src/AsyncKeyLock/AsyncKeyLock.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Authors>usercode</Authors>
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="5.0.0">
+    <PackageReference Include="MinVer" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/AsyncKeyLock/AsyncLock.cs

@@ -10,20 +10,19 @@ namespace AsyncKeyLock;
 public sealed class AsyncLock
 {
     public AsyncLock()
+        : this(new Lock())
     {
-        SyncObj = _waitingWriters;
-
-        _readerReleaserTask = Task.FromResult(new ReaderReleaser(this, true));
-        _writerReleaserTask = Task.FromResult(new WriterReleaser(this, true));
     }
 
-    internal AsyncLock(object syncObject)
-        : this()
+    internal AsyncLock(Lock syncObject)
     {
         SyncObj = syncObject;
+
+        _readerReleaserTask = Task.FromResult(new ReaderReleaser(this, true));
+        _writerReleaserTask = Task.FromResult(new WriterReleaser(this, true));
     }
 
-    internal readonly object SyncObj;
+    internal readonly Lock SyncObj;
 
     private readonly Queue<TaskCompletionSource<ReaderReleaser>> _waitingReaders = new();
     private readonly Queue<TaskCompletionSource<WriterReleaser>> _waitingWriters = new();

src/AsyncKeyLock/AsyncLock~.cs

@@ -2,6 +2,8 @@
 // https://github.com/usercode/AsyncKeyLock
 // MIT License
 
+using System.Runtime.InteropServices;
+
 namespace AsyncKeyLock;
 
 /// <summary>
@@ -15,44 +17,46 @@ public AsyncLock(int maxPoolSize = 64)
         _pool = new Pool<AsyncLock>(maxPoolSize);
     }
 
-    private readonly Dictionary<TKey, AsyncLock> _locks = new();
+    private readonly Dictionary<TKey, AsyncLock> _activeLocks = new();
     private readonly Pool<AsyncLock> _pool;
+    private readonly Lock _lock = new Lock();
 
     /// <summary>
     /// GetAsyncLock
     /// </summary>
     private AsyncLock GetAsyncLock(TKey key)
     {
-        if (_locks.TryGetValue(key, out AsyncLock? asyncLock) == false)
+        ref AsyncLock? dictionaryValue = ref CollectionsMarshal.GetValueRefOrAddDefault(_activeLocks, key, out bool exists);
+
+        if (exists)
         {
-            //create new AsyncLock
-            _pool.GetOrCreate(out asyncLock,
-                () =>
-                {
-                    AsyncLock a = new AsyncLock(_locks);
-                    a.Released += x =>
-                    {
-                        _locks.Remove(key);
+            return dictionaryValue!;
+        }
 
-                        //add idle AsynLock to pool
-                        _pool.Add(x);
-                    };
+        _pool.GetOrCreate(out dictionaryValue,
+            () =>
+            {
+                AsyncLock a = new AsyncLock(_lock);
+                a.Released += x =>
+                {
+                    _activeLocks.Remove(key);
 
-                    return a;
-                });
+                    //add idle AsynLock to pool
+                    _pool.Add(x);
+                };
 
-            _locks.Add(key, asyncLock);
-        }
+                return a;
+            });
 
-        return asyncLock;
+        return dictionaryValue;
     }
 
     /// <summary>
     /// ReaderLockAsync
     /// </summary>
     public Task<ReaderReleaser> ReaderLockAsync(TKey key, CancellationToken cancellation = default)
     {
-        lock (_locks)
+        lock (_lock)
         {
             return GetAsyncLock(key).ReaderLockAsync(cancellation);
         }
@@ -63,7 +67,7 @@ public Task<ReaderReleaser> ReaderLockAsync(TKey key, CancellationToken cancella
     /// </summary>
     public Task<WriterReleaser> WriterLockAsync(TKey key, CancellationToken cancellation = default)
     {
-        lock (_locks)
+        lock (_lock)
         {
             return GetAsyncLock(key).WriterLockAsync(cancellation);
         }