use v8::MicrotaskPolicy::kExplicit

denoland · Aug 19, 2019 · 838e811 · 838e811
1 parent 4faab6a
commit 838e811
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git a/core/isolate.rs b/core/isolate.rs
@@ -389,6 +389,11 @@ impl Isolate {
     self.check_last_exception()
   }
 
+  fn run_microtasks(&self) -> Result<(), ErrBox> {
+    unsafe { libdeno::deno_run_microtasks(self.libdeno_isolate) };
+    self.check_last_exception()
+  }
+
   fn check_last_exception(&self) -> Result<(), ErrBox> {
     let ptr = unsafe { libdeno::deno_last_exception(self.libdeno_isolate) };
     if ptr.is_null() {
@@ -690,6 +695,7 @@ impl Future for Isolate {
       drop(locker);
     }
 
+    self.run_microtasks()?;
     self.check_promise_errors();
     self.check_last_exception()?;
 

diff --git a/core/libdeno.rs b/core/libdeno.rs
@@ -280,6 +280,7 @@ extern "C" {
     js_source: *const c_char,
   );
   pub fn deno_terminate_execution(i: *const isolate);
+  pub fn deno_run_microtasks(i: *const isolate);
 
   // Modules
 

diff --git a/core/libdeno/api.cc b/core/libdeno/api.cc
@@ -233,4 +233,11 @@ void deno_terminate_execution(Deno* d_) {
   deno::DenoIsolate* d = reinterpret_cast<deno::DenoIsolate*>(d_);
   d->isolate_->TerminateExecution();
 }
+
+void deno_run_microtasks(Deno* d_) {
+  deno::DenoIsolate* d = reinterpret_cast<deno::DenoIsolate*>(d_);
+  v8::Locker locker(d->isolate_);
+  v8::Isolate::Scope isolate_scope(d->isolate_);
+  d->isolate_->RunMicrotasks();
+}
 }
diff --git a/core/libdeno/binding.cc b/core/libdeno/binding.cc
@@ -564,6 +564,7 @@ v8::MaybeLocal<v8::Promise> HostImportModuleDynamicallyCallback(
 
 void DenoIsolate::AddIsolate(v8::Isolate* isolate) {
   isolate_ = isolate;
+  isolate_->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
   isolate_->SetCaptureStackTraceForUncaughtExceptions(
       true, 10, v8::StackTrace::kDetailed);
   isolate_->SetPromiseRejectCallback(deno::PromiseRejectCallback);

diff --git a/core/libdeno/deno.h b/core/libdeno/deno.h
@@ -119,6 +119,7 @@ const char* deno_last_exception(Deno* d);
 
 void deno_terminate_execution(Deno* d);
 
+void deno_run_microtasks(Deno* d);
 // Module API
 
 typedef int deno_mod;