Added support of cancellation token

dotnet · Jun 23, 2024 · 53a87ff · 53a87ff
1 parent 4c1b238
commit 53a87ff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/DotNext.Tests/Threading/AsyncBridgeTests.cs b/src/DotNext.Tests/Threading/AsyncBridgeTests.cs
@@ -26,6 +26,15 @@ public static async Task WaitForSignal()
         await ev.WaitAsync(DefaultTimeout);
     }
 
+    [Fact]
+    public static async Task CancelWaitForSignal()
+    {
+        using var ev = new ManualResetEvent(false);
+        using var cts = new CancellationTokenSource();
+        cts.CancelAfter(150);
+        await ThrowsAsync<OperationCanceledException>(async () => await ev.WaitAsync(cts.Token));
+    }
+
     [Fact]
     public static async Task AlreadySignaled()
     {

diff --git a/src/DotNext.Threading/Threading/AsyncBridge.cs b/src/DotNext.Threading/Threading/AsyncBridge.cs
@@ -92,8 +92,10 @@ static void Complete(object? state, bool timedOut)
     /// </summary>
     /// <param name="handle">The handle to await.</param>
     /// <param name="timeout">The timeout used to await completion.</param>
+    /// <param name="token">The token that can be used to cancel the operation.</param>
     /// <returns><see langword="true"/> if handle is signaled; otherwise, <see langword="false"/> if timeout occurred.</returns>
-    public static ValueTask<bool> WaitAsync(this WaitHandle handle, TimeSpan timeout)
+    /// <exception cref="OperationCanceledException">The operation has been canceled.</exception>
+    public static ValueTask<bool> WaitAsync(this WaitHandle handle, TimeSpan timeout, CancellationToken token = default)
     {
         ValueTask<bool> result;
         if (handle.WaitOne(0))
@@ -106,7 +108,7 @@ public static ValueTask<bool> WaitAsync(this WaitHandle handle, TimeSpan timeout
         }
         else
         {
-            result = GetCompletionSource(handle, timeout).CreateTask(InfiniteTimeSpan, CancellationToken.None);
+            result = GetCompletionSource(handle, timeout).CreateTask(InfiniteTimeSpan, token);
         }
 
         return result;
@@ -118,13 +120,15 @@ public static ValueTask<bool> WaitAsync(this WaitHandle handle, TimeSpan timeout
     /// Obtains a task that can be used to await handle completion.
     /// </summary>
     /// <param name="handle">The handle to await.</param>
+    /// <param name="token">The token that can be used to cancel the operation.</param>
     /// <returns>The task that will be completed .</returns>
-    public static ValueTask WaitAsync(this WaitHandle handle)
+    /// <exception cref="OperationCanceledException">The operation has been canceled.</exception>
+    public static ValueTask WaitAsync(this WaitHandle handle, CancellationToken token = default)
         => handle.WaitOne(0)
             ? ValueTask.CompletedTask
             : GetCompletionSource(handle, InfiniteTimeSpan)
                 .As<ISupplier<TimeSpan, CancellationToken, ValueTask>>()
-                .Invoke(InfiniteTimeSpan, CancellationToken.None);
+                .Invoke(InfiniteTimeSpan, token);
 
     /// <summary>
     /// Gets or sets the capacity of the internal pool used to create awaitable tasks returned