Revert "Prefer using CancellationToken.WaitHandle again"

This reverts commit 4ced644.
HangfireIO · Nov 26, 2024 · 49a8023 · 49a8023
1 parent 9685dd9
commit 49a8023
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Hangfire.Core/Common/CancellationTokenExtentions.cs b/src/Hangfire.Core/Common/CancellationTokenExtentions.cs
@@ -28,7 +28,6 @@ public static class CancellationTokenExtentions
         /// on cancellation token registration and avoids using the <see cref="CancellationToken.WaitHandle"/>
         /// property as it may lead to high CPU issues.
         /// </summary>
-        [Obsolete("CancellationToken.WaitHandle is now preferred, since early days of .NET Core passed. Will be removed in 2.0.0.")]
         public static CancellationEvent GetCancellationEvent(this CancellationToken cancellationToken)
         {
             return new CancellationEvent(cancellationToken);
@@ -57,8 +56,10 @@ public static void WaitOrThrow(this CancellationToken cancellationToken, TimeSpa
         /// </summary>
         public static bool Wait(this CancellationToken cancellationToken, TimeSpan timeout)
         {
+            using var cancellationEvent = GetCancellationEvent(cancellationToken);
+
             var stopwatch = Stopwatch.StartNew();
-            var waitResult = cancellationToken.WaitHandle.WaitOne(timeout);
+            var waitResult = cancellationEvent.WaitHandle.WaitOne(timeout);
             stopwatch.Stop();
 
             var timeoutThreshold = TimeSpan.FromMilliseconds(1000);
@@ -83,7 +84,6 @@ public static bool Wait(this CancellationToken cancellationToken, TimeSpan timeo
             return waitResult;
         }
 
-        [Obsolete("CancellationToken.WaitHandle is now preferred, since early days of .NET Core passed. Will be removed in 2.0.0.")]
         public sealed class CancellationEvent : IDisposable
         {
             private static readonly Action<object> SetEventCallback = SetEvent;

diff --git a/src/Hangfire.Core/Processing/TaskExtensions.cs b/src/Hangfire.Core/Processing/TaskExtensions.cs
@@ -36,7 +36,9 @@ public static bool WaitOne([NotNull] this WaitHandle waitHandle, TimeSpan timeou
 
             token.ThrowIfCancellationRequested();
 
-            var waitHandles = new[] { waitHandle, token.WaitHandle };
+            using var ev = token.GetCancellationEvent();
+
+            var waitHandles = new[] { waitHandle, ev.WaitHandle };
 
             var stopwatch = Stopwatch.StartNew();
             var waitResult = WaitHandle.WaitAny(waitHandles, timeout);

diff --git a/src/Hangfire.Core/Server/CoreBackgroundJobPerformer.cs b/src/Hangfire.Core/Server/CoreBackgroundJobPerformer.cs
@@ -182,6 +182,7 @@ private static object InvokeOnTaskPump(PerformContext context, Tuple<MethodInfo,
             try
             {
                 using (var syncContext = new InlineSynchronizationContext())
+                using (var cancellationEvent = context.CancellationToken.ShutdownToken.GetCancellationEvent())
                 {
                     SynchronizationContext.SetSynchronizationContext(syncContext);
 
@@ -191,7 +192,7 @@ private static object InvokeOnTaskPump(PerformContext context, Tuple<MethodInfo,
                     var task = getTaskFunc(result);
                     var asyncResult = (IAsyncResult)task;
 
-                    var waitHandles = new[] { syncContext.WaitHandle, asyncResult.AsyncWaitHandle, context.CancellationToken.ShutdownToken.WaitHandle };
+                    var waitHandles = new[] { syncContext.WaitHandle, asyncResult.AsyncWaitHandle, cancellationEvent.WaitHandle };
 
                     while (!asyncResult.IsCompleted && WaitHandle.WaitAny(waitHandles) == 0)
                     {