- Account for number of pending tasks in old-space collections.

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 "platform/assert.h"
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 121 matching lines @@
     Dart_ExitScope();
   } else {
     *error = zone->PrintToString(
         "Unable to canonicalize uri '%s': no library tag handler found.",
         uri.ToCString());
   }
   return retval;
 }
 
 
-static bool CreateIsolate(IsolateSpawnState* state, char** error) {
-  Isolate* parent_isolate = Isolate::Current();
-
+static bool CreateIsolate(Isolate* parent_isolate,
+                          IsolateSpawnState* state,
+                          char** error) {
   Dart_IsolateCreateCallback callback = Isolate::CreateCallback();
   if (callback == NULL) {
     *error = strdup("Null callback specified for isolate creation\n");
     Isolate::SetCurrent(parent_isolate);
     return false;
   }
 
   void* init_data = parent_isolate->init_callback_data();
   Isolate* child_isolate = reinterpret_cast<Isolate*>(
       (callback)(state->script_url(),
                  state->function_name(),
                  init_data,
                  error));
   if (child_isolate == NULL) {
     Isolate::SetCurrent(parent_isolate);
     return false;
   }
   state->set_isolate(reinterpret_cast<Isolate*>(child_isolate));
 
   Isolate::SetCurrent(parent_isolate);
   return true;
 }
 
 
-static RawObject* Spawn(NativeArguments* arguments, IsolateSpawnState* state) {
+static RawObject* Spawn(Isolate* parent_isolate,
+                        IsolateSpawnState* state) {
   // Create a new isolate.
   char* error = NULL;
-  if (!CreateIsolate(state, &error)) {
+  if (!CreateIsolate(parent_isolate, state, &error)) {
     delete state;
     const String& msg = String::Handle(String::New(error));
     free(error);
     ThrowIsolateSpawnException(msg);
   }
 
   // The result of spawning an Isolate is an array with 3 elements:
   // [main_port, pause_capability, terminate_capability]
   const Array& result = Array::Handle(Array::New(3));
 
@@ skipping 23 matching lines @@
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, closure, arguments->NativeArgAt(0));
   if (closure.IsClosure()) {
     Function& func = Function::Handle();
     func = Closure::function(closure);
     if (func.IsImplicitClosureFunction() && func.is_static()) {
 #if defined(DEBUG)
       Context& ctx = Context::Handle();
       ctx = Closure::context(closure);
       ASSERT(ctx.num_variables() == 0);
 #endif
-      return Spawn(arguments, new IsolateSpawnState(func));
+      return Spawn(isolate, new IsolateSpawnState(func));
     }
   }
   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();
 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(String, uri, arguments->NativeArgAt(0));
 
   // Canonicalize the uri with respect to the current isolate.
   char* error = NULL;
   char* canonical_uri = NULL;
   const Library& root_lib =
       Library::Handle(arguments->isolate()->object_store()->root_library());
   if (!CanonicalizeUri(arguments->isolate(), root_lib, uri,
                        &canonical_uri, &error)) {
     const String& msg = String::Handle(String::New(error));
     ThrowIsolateSpawnException(msg);
   }
 
-  return Spawn(arguments, new IsolateSpawnState(canonical_uri));
+  return Spawn(isolate, new IsolateSpawnState(canonical_uri));
 }
 
 
 DEFINE_NATIVE_ENTRY(Isolate_sendOOB, 2) {
   GET_NON_NULL_NATIVE_ARGUMENT(SendPort, port, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(Array, msg, arguments->NativeArgAt(1));
 
   // Make sure to route this request to the isolate library OOB mesage handler.
   msg.SetAt(0, Smi::Handle(Smi::New(Message::kIsolateLibOOBMsg)));
 
@@ skipping 11 matching lines @@
 DEFINE_NATIVE_ENTRY(Isolate_mainPort, 0) {
   // The control port is being accessed as a regular port from Dart code. This
   // is most likely due to the _startIsolate code in dart:isolate. Account for
   // this by increasing the number of open control ports.
   isolate->message_handler()->increment_control_ports();
 
   return ReceivePort::New(isolate->main_port());
 }
 
 }  // namespace dart