Remove race(s) in vmservice tests.

runtime/bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 482 matching lines @@
     char errbuf[256];
     snprintf(errbuf, sizeof(errbuf),
              "Expected a library when loading script: %s",
              script_uri);
     *error = strdup(errbuf);
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return NULL;
   }
 
-  VmService::SendIsolateStartupMessage(Dart_GetMainPortId());
-
   // Make the isolate runnable so that it is ready to handle messages.
   Dart_ExitScope();
   Dart_ExitIsolate();
   bool retval = Dart_IsolateMakeRunnable(isolate);
   if (!retval) {
     *error = strdup("Invalid isolate state - Unable to make it runnable");
     Dart_EnterIsolate(isolate);
     Dart_ShutdownIsolate();
     return NULL;
   }
 
+  Dart_EnterIsolate(isolate);

[Ivan Posva, 2013/08/07 23:33:38]

You cannot enter the isolate after having made it runnable. Suddenly two threads
will execute concurrently within one isolate. You need to get the name before
making the isolate runnable.

[Cutch, 2013/08/08 14:26:39]

Done.

+  Dart_EnterScope();
+
+  Dart_Handle debug_name = Dart_DebugName();
+  CHECK_RESULT(debug_name);
+  VmService::SendIsolateStartupMessage(Dart_GetMainPortId(), debug_name);
+
+  Dart_ExitScope();
+  Dart_ExitIsolate();
+
   return isolate;
 }
 
 
 static Dart_Isolate CreateIsolateAndSetup(const char* script_uri,
                                           const char* main,
                                           void* data, char** error) {
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
                                      new IsolateData(),
@@ skipping 362 matching lines @@
 
   return Process::GlobalExitCode();
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }