Avoid use Task.Delay().Wait()

use method with no HANDLE alloc, fix cuteant#37
yyjdelete · May 17, 2021 · d24906d · d24906d
1 parent f79d65b
commit d24906d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/DotNetty.Common/Concurrency/XThread.cs b/src/DotNetty.Common/Concurrency/XThread.cs
@@ -121,7 +121,16 @@ public void Start(object parameter)
 
         public static void Sleep(int millisecondsTimeout)
         {
-            Task.Delay(millisecondsTimeout).Wait();
+            Thread.Sleep(millisecondsTimeout);
+        }
+
+        /// <exception cref="T:System.OperationCanceledException"><paramref name="cancellationToken" /> was canceled.</exception>
+        public static void Sleep(int millisecondsTimeout, CancellationToken cancellationToken)
+        {
+            using (var ev = new ManualResetEventSlim())
+            {
+                ev.Wait(millisecondsTimeout, cancellationToken);
+            }
         }
 
         public int Id => _threadId;

diff --git a/src/DotNetty.Common/Utilities/HashedWheelTimer.cs b/src/DotNetty.Common/Utilities/HashedWheelTimer.cs
@@ -423,15 +423,13 @@ TimeSpan WaitForNextTick()
                             : currentTime;
                     }
 
-                    Task delay = null;
                     try
                     {
                         long sleepTimeMs = sleepTime.Ticks / TimeSpan.TicksPerMillisecond; // we've already rounded so no worries about the remainder > 0 here
                         Debug.Assert(sleepTimeMs <= int.MaxValue);
-                        delay = Task.Delay((int)sleepTimeMs, _owner.CancellationToken);
-                        delay.Wait();
+                        XThread.Sleep((int)sleepTimeMs, _owner.CancellationToken);
                     }
-                    catch (AggregateException) when (delay is object && delay.IsCanceled)
+                    catch (OperationCanceledException)
                     {
                         if (Volatile.Read(ref _owner.v_workerState) == WorkerStateShutdown)
                         {