src: spin shutdown loop while immediates are pending

This allows using `SetImmediate()` and friends at any point during cleanup. PR-URL: #34662 Fixes: #34657 Refs: #34572 Reviewed-By: Gabriel Schulhof <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Aug 8, 2020 · 2761f34 · 2761f34
1 parent 39ca48c
commit 2761f34
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/env.cc b/src/env.cc
@@ -593,7 +593,10 @@ void Environment::RunCleanup() {
   initial_base_object_count_ = 0;
   CleanupHandles();
 
-  while (!cleanup_hooks_.empty()) {
+  while (!cleanup_hooks_.empty() ||
+         native_immediates_.size() > 0 ||
+         native_immediates_threadsafe_.size() > 0 ||
+         native_immediates_interrupts_.size() > 0) {
     // Copy into a vector, since we can't sort an unordered_set in-place.
     std::vector<CleanupHookCallback> callbacks(
         cleanup_hooks_.begin(), cleanup_hooks_.end());