misc perf improvements

soenneker · Jan 8, 2025 · 99338a6 · 99338a6
1 parent 5d8940f
commit 99338a6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/AsyncSingleton.cs b/src/AsyncSingleton.cs
@@ -67,9 +67,9 @@ public AsyncSingleton()
         _lock = new AsyncLock();
     }
 
-    public async ValueTask Init(params object[] objects)
+    public ValueTask Init(params object[] objects)
     {
-        await Init(CancellationToken.None, objects);
+        return Init(CancellationToken.None, objects);
     }
 
     public async ValueTask Init(CancellationToken cancellationToken, params object[] objects)
@@ -85,7 +85,7 @@ public async ValueTask Init(CancellationToken cancellationToken, params object[]
             if (_instance != null)
                 return;
 
-            _instance = await InitInternal(cancellationToken, objects);
+            _instance = await InitInternal(cancellationToken, objects).NoSync();
         }
     }
 
@@ -263,7 +263,7 @@ public void Dispose()
                 break;
         }
 
-        _instance = default;
+        _instance = null;
         GC.SuppressFinalize(this);
     }
 
@@ -287,7 +287,7 @@ public async ValueTask DisposeAsync()
                 break;
         }
 
-        _instance = default;
+        _instance = null;
         GC.SuppressFinalize(this);
     }
 }
diff --git a/src/AsyncSingleton{T}.cs b/src/AsyncSingleton{T}.cs
@@ -102,7 +102,7 @@ public virtual async ValueTask<T> Get(CancellationToken cancellationToken, param
             if (_instance != null)
                 return _instance;
 
-            _instance = await GetInternal(cancellationToken, objects);
+            _instance = await GetInternal(cancellationToken, objects).NoSync();
             return _instance;
         }
     }

diff --git a/test/Soenneker.Utils.AsyncSingleton.Tests/AsyncSingletonTests.cs b/test/Soenneker.Utils.AsyncSingleton.Tests/AsyncSingletonTests.cs
@@ -104,7 +104,7 @@ public async Task DisposeAsync_with_cancellationToken_with_nondisposable_should_
     [Fact]
     public async Task Async_with_object_and_cancellationToken_should_not_throw()
     {
-        var httpClientSingleton = new AsyncSingleton(async (token, obj) => new object());
+        var httpClientSingleton = new AsyncSingleton(async (token, _) => new object());
 
         await httpClientSingleton.Init(CancellationToken.None, 3);
     }

diff --git a/test/Soenneker.Utils.AsyncSingleton.Tests/Soenneker.Utils.AsyncSingleton.Tests.csproj b/test/Soenneker.Utils.AsyncSingleton.Tests/Soenneker.Utils.AsyncSingleton.Tests.csproj
@@ -17,11 +17,11 @@
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="Soenneker.Tests.Unit" Version="3.0.606" />
-        <PackageReference Include="xunit.v3" Version="1.0.0" />
-    <PackageReference Include="xUnit.v3" Version="1.0.0" /></ItemGroup>
+        <PackageReference Include="xUnit.v3" Version="1.0.0" />
+    </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\src\Soenneker.Utils.AsyncSingleton.csproj" />
     </ItemGroup>
 
-</Project>
+</Project>