Improve new BasicAsyncLock APIs

imazen · Feb 27, 2024 · e1a3c99 · e1a3c99
1 parent 772cde1
commit e1a3c99
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/Imazen.Common/Concurrency/BasicAsyncLock.cs b/src/Imazen.Common/Concurrency/BasicAsyncLock.cs
@@ -10,18 +10,10 @@ public BasicAsyncLock()
             releaser = Task.FromResult((IDisposable)new Releaser(this));
         }
 
-        public Task<IDisposable> LockAsync(CancellationToken cancellationToken = default)
+        public Task<IDisposable> LockAsync() => LockAsyncWithTimeout(Timeout.Infinite, CancellationToken.None);
+        public Task<IDisposable> LockAsyncWithTimeout(int timeoutMilliseconds = Timeout.Infinite, CancellationToken cancellationToken = default)
         {
-            var wait = semaphore.WaitAsync(cancellationToken);
-            return wait.IsCompleted ?
-                        releaser :
-                        wait.ContinueWith((_, state) => (IDisposable)state!,
-                            releaser.Result, CancellationToken.None,
-            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        }
-        public Task<IDisposable> LockAsync(TimeSpan timeout, CancellationToken cancellationToken = default)
-        {
-            var wait = semaphore.WaitAsync(timeout, cancellationToken);
+            var wait = semaphore.WaitAsync(timeoutMilliseconds, cancellationToken);
             return wait.IsCompleted ?
                 releaser :
                 wait.ContinueWith((_, state) => (IDisposable)state!,