[vm] Fix deadlock in isolate shutdown, take 2.

Enter a safepoint when waiting for child isolate spawns to complete, since the child isolate now requires its parent (along with all other members of the isolate group) to participate in safepoints. Adjust shutdown of ThreadPool isolates to re-enter the isolate before waiting for outstanding spawns. Bug: #37679 Change-Id: I760c0f75b77a3884ac3f4757f0c6920a417f3453 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/111524 Reviewed-by: Alexander Aprelev <[email protected]> Reviewed-by: Martin Kustermann <[email protected]>
dart-lang · Aug 1, 2019 · b66cd42 · b66cd42
1 parent 6cec646
commit b66cd42
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
@@ -1808,15 +1808,17 @@ static MessageHandler::MessageStatus RunIsolate(uword parameter) {
 
 static void ShutdownIsolate(uword parameter) {
   Isolate* isolate = reinterpret_cast<Isolate*>(parameter);
-  // We must wait for any outstanding spawn calls to complete before
-  // running the shutdown callback.
-  isolate->WaitForOutstandingSpawns();
   {
     // Print the error if there is one.  This may execute dart code to
     // print the exception object, so we need to use a StartIsolateScope.
     StartIsolateScope start_scope(isolate);
     Thread* thread = Thread::Current();
     ASSERT(thread->isolate() == isolate);
+
+    // We must wait for any outstanding spawn calls to complete before
+    // running the shutdown callback.
+    isolate->WaitForOutstandingSpawns();
+
     StackZone zone(thread);
     HandleScope handle_scope(thread);
 #if defined(DEBUG)
@@ -2998,9 +3000,11 @@ void Isolate::DecrementSpawnCount() {
 }
 
 void Isolate::WaitForOutstandingSpawns() {
+  Thread* thread = Thread::Current();
+  ASSERT(thread != NULL);
   MonitorLocker ml(&spawn_count_monitor_);
   while (spawn_count_ > 0) {
-    ml.Wait();
+    ml.WaitWithSafepointCheck(thread);
   }
 }
 

diff --git a/runtime/vm/kernel_isolate.cc b/runtime/vm/kernel_isolate.cc
@@ -134,14 +134,14 @@ class RunKernelTask : public ThreadPool::Task {
       OS::PrintErr(DART_KERNEL_ISOLATE_NAME ": ShutdownIsolate\n");
     }
     Isolate* I = reinterpret_cast<Isolate*>(parameter);
-    I->WaitForOutstandingSpawns();
     {
       // Print the error if there is one.  This may execute dart code to
       // print the exception object, so we need to use a StartIsolateScope.
       ASSERT(Isolate::Current() == NULL);
       StartIsolateScope start_scope(I);
       Thread* T = Thread::Current();
       ASSERT(I == T->isolate());
+      I->WaitForOutstandingSpawns();
       StackZone zone(T);
       HandleScope handle_scope(T);
       Error& error = Error::Handle(Z);

diff --git a/runtime/vm/service_isolate.cc b/runtime/vm/service_isolate.cc
@@ -381,14 +381,14 @@ class RunServiceTask : public ThreadPool::Task {
     }
     Isolate* I = reinterpret_cast<Isolate*>(parameter);
     ASSERT(ServiceIsolate::IsServiceIsolate(I));
-    I->WaitForOutstandingSpawns();
     {
       // Print the error if there is one.  This may execute dart code to
       // print the exception object, so we need to use a StartIsolateScope.
       ASSERT(Isolate::Current() == NULL);
       StartIsolateScope start_scope(I);
       Thread* T = Thread::Current();
       ASSERT(I == T->isolate());
+      I->WaitForOutstandingSpawns();
       StackZone zone(T);
       HandleScope handle_scope(T);
       Error& error = Error::Handle(Z);

diff --git a/tests/co19_2/co19_2-kernel.status b/tests/co19_2/co19_2-kernel.status
@@ -9,10 +9,6 @@ LanguageFeatures/Set-literals/syntax_compatibility_A01_t02: RuntimeError
 LibTest/isolate/Isolate/kill_A01_t01: Skip # Issue 37699
 LibTest/isolate/Isolate/pause_A01_t01: Skip # Issue 37699
 LibTest/isolate/Isolate/pause_A01_t02: Skip # Issue 37699
-LibTest/isolate/ReceivePort/firstWhere_A01_t01: Skip # Issue 37679
-LibTest/isolate/ReceivePort/firstWhere_A02_t01: Skip # Issue 37679
-LibTest/isolate/ReceivePort/transform_A01_t01: Skip # Issue 37679
-LibTest/isolate/ReceivePort/transform_A01_t02: Skip # Issue 37679
 
 [ $compiler == dartkp ]
 Language/Expressions/Instance_Creation/New/evaluation_t20: RuntimeError