Fix Shutdown race.

runtime/lib/isolate.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_native_api.h"
 #include "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
@@ skipping 125 matching lines @@
 
 class SpawnIsolateTask : public ThreadPool::Task {
  public:
   explicit SpawnIsolateTask(IsolateSpawnState* state) : state_(state) {}
 
   virtual void Run() {
     // Create a new isolate.
     char* error = NULL;
     Dart_IsolateCreateCallback callback = Isolate::CreateCallback();
     if (callback == NULL) {
+      state_->DecrementSpawnCount();
       ReportError(
           "Isolate spawn is not supported by this Dart implementation\n");
       delete state_;
       state_ = NULL;
       return;
     }
 
     Dart_IsolateFlags api_flags;
     state_->isolate_flags()->CopyTo(&api_flags);
 
     Isolate* isolate = reinterpret_cast<Isolate*>(
         (callback)(state_->script_url(),
                    state_->function_name(),
                    state_->package_root(),
                    state_->package_map(),
                    &api_flags,
                    state_->init_data(),
                    &error));
+    state_->DecrementSpawnCount();
     if (isolate == NULL) {
       ReportError(error);
       delete state_;
       state_ = NULL;
       free(error);
       return;
     }
 
     if (state_->origin_id() != ILLEGAL_PORT) {
       // For isolates spawned using spawnFunction we set the origin_id
@@ skipping 44 matching lines @@
       ctx = Closure::context(closure);
       ASSERT(ctx.num_variables() == 0);
 #endif
       // Get the parent function so that we get the right function name.
       func = func.parent_function();
 
       bool fatal_errors = fatalErrors.IsNull() ? true : fatalErrors.value();
       Dart_Port on_exit_port = onExit.IsNull() ? ILLEGAL_PORT : onExit.Id();
       Dart_Port on_error_port = onError.IsNull() ? ILLEGAL_PORT : onError.Id();
 
-      ThreadPool::Task* spawn_task =
-          new SpawnIsolateTask(
-              new IsolateSpawnState(port.Id(),
-                                    isolate->origin_id(),
-                                    isolate->init_callback_data(),
-                                    func,
-                                    message,
-                                    paused.value(),
-                                    fatal_errors,
-                                    on_exit_port,
-                                    on_error_port));
+      IsolateSpawnState* state =
+          new IsolateSpawnState(port.Id(),
+                                isolate->origin_id(),
+                                isolate->init_callback_data(),
+                                func,
+                                message,
+                                isolate->spawn_count_monitor(),
+                                isolate->spawn_count(),
+                                paused.value(),
+                                fatal_errors,
+                                on_exit_port,
+                                on_error_port);
+      ThreadPool::Task* spawn_task = new SpawnIsolateTask(state);
+
+      isolate->IncrementSpawnCount();
       if (FLAG_i_like_slow_isolate_spawn) {
         // We block the parent isolate while the child isolate loads.
         Isolate* saved = Isolate::Current();
         Thread::ExitIsolate();
         spawn_task->Run();
         delete spawn_task;
         spawn_task = NULL;
         Thread::EnterIsolate(saved);
-      } else {
-        Dart::thread_pool()->Run(spawn_task);
+      } else if (!Dart::thread_pool()->Run(spawn_task)) {
+        // Running on the thread pool failed. Clean up everything.
+        state->DecrementSpawnCount();
+        delete state;
+        state = NULL;
+        delete spawn_task;
+        spawn_task = NULL;
       }
       return Object::null();
     }
   }
   const String& msg = String::Handle(String::New(
       "Isolate.spawn expects to be passed a static or top-level function"));
   Exceptions::ThrowArgumentError(msg);
   return Object::null();
 }
 
@@ skipping 109 matching lines @@
 
   IsolateSpawnState* state =
       new IsolateSpawnState(
           port.Id(),
           isolate->init_callback_data(),
           canonical_uri,
           utf8_package_root,
           utf8_package_map,
           args,
           message,
+          isolate->spawn_count_monitor(),
+          isolate->spawn_count(),
           paused.value(),
           fatal_errors,
           on_exit_port,
           on_error_port);
 
   // If we were passed a value then override the default flags state for
   // checked mode.
   if (!checked.IsNull()) {
     state->isolate_flags()->set_checked(checked.value());
   }
 
   ThreadPool::Task* spawn_task = new SpawnIsolateTask(state);
+
+  isolate->IncrementSpawnCount();
   if (FLAG_i_like_slow_isolate_spawn) {
     // We block the parent isolate while the child isolate loads.
     Isolate* saved = Isolate::Current();
     Thread::ExitIsolate();
     spawn_task->Run();
     delete spawn_task;
     spawn_task = NULL;
     Thread::EnterIsolate(saved);
-  } else {
-    Dart::thread_pool()->Run(spawn_task);
+  } else if (!Dart::thread_pool()->Run(spawn_task)) {
+    // Running on the thread pool failed. Clean up everything.
+    state->DecrementSpawnCount();
+    delete state;
+    state = NULL;
+    delete spawn_task;
+    spawn_task = NULL;
   }
   return Object::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_getPortAndCapabilitiesOfCurrentIsolate, 0) {
   const Array& result = Array::Handle(Array::New(3));
   result.SetAt(0, SendPort::Handle(SendPort::New(isolate->main_port())));
   result.SetAt(1, Capability::Handle(
                       Capability::New(isolate->pause_capability())));
@@ skipping 14 matching lines @@
   MessageWriter writer(&data, &allocator, false);
   writer.WriteMessage(msg);
 
   PortMap::PostMessage(new Message(port.Id(),
                                    data, writer.BytesWritten(),
                                    Message::kOOBPriority));
   return Object::null();
 }
 
 }  // namespace dart