Replace TaskCompletionSource with ManualResetEventSlim

sebastienros · Jun 9, 2024 · 6d02edc · 6d02edc
1 parent 730ca83
commit 6d02edc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/Jint/JsValueExtensions.cs b/Jint/JsValueExtensions.cs
@@ -650,16 +650,9 @@ public static JsValue UnwrapIfPromise(this JsValue value)
         if (value is JsPromise promise)
         {
             var engine = promise.Engine;
-            var task = promise.TaskCompletionSource.Task;
+            var completedEvent = promise.CompletedEvent;
             engine.RunAvailableContinuations();
-            engine.AddToEventLoop(() =>
-            {
-                if (!task.IsCompleted)
-                {
-                    // Task.Wait has the potential of inlining the task's execution on the current thread; avoid this.
-                    ((IAsyncResult) task).AsyncWaitHandle.WaitOne();
-                }
-            });
+            engine.AddToEventLoop(completedEvent.Wait);
             engine.RunAvailableContinuations();
             switch (promise.State)
             {

diff --git a/Jint/Native/JsPromise.cs b/Jint/Native/JsPromise.cs
@@ -1,3 +1,4 @@
+using System.Threading;
 using Jint.Native.Object;
 using Jint.Native.Promise;
 using Jint.Runtime;
@@ -12,7 +13,7 @@ internal sealed class JsPromise : ObjectInstance
 
     // valid only in settled state (Fulfilled or Rejected)
     internal JsValue Value { get; private set; } = null!;
-    internal TaskCompletionSource<JsPromise> TaskCompletionSource { get; }= new();
+    internal ManualResetEventSlim CompletedEvent { get; } = new();
 
     internal List<PromiseReaction> PromiseRejectReactions = new();
     internal List<PromiseReaction> PromiseFulfillReactions = new();
@@ -127,7 +128,7 @@ private JsValue RejectPromise(JsValue reason)
         var reactions = PromiseRejectReactions;
         PromiseRejectReactions = new List<PromiseReaction>();
         PromiseFulfillReactions.Clear();
-        TaskCompletionSource.SetCanceled();
+        CompletedEvent.Set();
 
         // Note that this part is skipped because there is no tracking yet
         // 7. If promise.[[PromiseIsHandled]] is false, perform HostPromiseRejectionTracker(promise, "reject").
@@ -147,7 +148,7 @@ private JsValue FulfillPromise(JsValue result)
         var reactions = PromiseFulfillReactions;
         PromiseFulfillReactions = new List<PromiseReaction>();
         PromiseRejectReactions.Clear();
-        TaskCompletionSource.SetResult(this);
+        CompletedEvent.Set();
 
         return PromiseOperations.TriggerPromiseReactions(_engine, reactions, result);
     }