core, bugfix: RunMicrotasks will deadlock due to reentry.

fibjs · Sep 16, 2023 · 6daf638 · 6daf638
1 parent 37c35ef
commit 6daf638
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/fibjs/include/Isolate.h b/fibjs/include/Isolate.h
@@ -187,6 +187,8 @@ class Isolate : public exlib::linkitem {
     std::unordered_map<uint32_t, SandBox*> m_sandboxes;
     uint32_t m_sandboxId = 0;
 
+    bool m_intask = false;
+
     obj_ptr<HttpClient> m_httpclient;
 
     obj_ptr<Stream_base> m_stdio[3];

diff --git a/fibjs/src/base/Isolate.cpp b/fibjs/src/base/Isolate.cpp
@@ -35,20 +35,24 @@ static int32_t syncRunMicrotasks(Isolate* isolate)
 {
     JSFiber::EnterJsScope s(NULL, true);
 
+    isolate->m_intask = true;
     isolate->m_isolate->PerformMicrotaskCheckpoint();
     if (isolate->m_isolate->HasPendingBackgroundTasks())
         while (v8::platform::PumpMessageLoop(g_default_platform, isolate->m_isolate,
             isolate->m_isolate->HasPendingBackgroundTasks()
                 ? v8::platform::MessageLoopBehavior::kWaitForWork
                 : platform::MessageLoopBehavior::kDoNotWait))
             ;
+    isolate->m_intask = false;
 
     return 0;
 }
 
 void Isolate::RunMicrotasks()
 {
-    if (RunMicrotaskSize(m_isolate) > 0 || m_isolate->HasPendingBackgroundTasks())
+    if (!m_intask
+        && (RunMicrotaskSize(m_isolate) > 0
+            || m_isolate->HasPendingBackgroundTasks()))
         syncCall(this, syncRunMicrotasks, this);
 }