Give isolates names to be used during debugging.

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 242 matching lines @@
   Dart_Handle source = DartUtils::ReadStringFromFile(script_name);
   if (Dart_IsError(source)) {
     return source;
   }
   Dart_Handle url = Dart_NewString(script_name);
 
   return Dart_LoadScript(url, source, LibraryTagHandler);
 }
 
 
-static bool CreateIsolateAndSetup(void* data, char** error) {
-  Dart_Isolate isolate = Dart_CreateIsolate(snapshot_buffer, data, error);
+static bool CreateIsolateAndSetup(const char* name_prefix,
+                                  void* data, char** error) {
+  Dart_Isolate isolate =
+      Dart_CreateIsolate(name_prefix, snapshot_buffer, data, error);
   if (isolate == NULL) {
     return false;
   }
 
   Dart_Handle library;
   Dart_EnterScope();
 
   // Load the specified application script into the newly created isolate.
   if (script_snapshot_buffer != NULL) {
     library = Dart_LoadScriptFromSnapshot(script_snapshot_buffer);
@@ skipping 26 matching lines @@
   Dart_ExitScope();
   return true;
 }
 
 
 static bool CaptureScriptSnapshot() {
   char* error = NULL;
   Dart_Handle result;
 
   // First create an isolate and load up the specified script in it.
-  if (!CreateIsolateAndSetup(NULL, &error)) {
+  if (!CreateIsolateAndSetup(NULL, NULL, &error)) {
     fprintf(stderr, "%s\n", error);
     free(canonical_script_name);
     free(error);
     return false;  // Indicates we encountered an error.
   }
 
   Dart_EnterScope();
 
 #if 0
   // Lookup the library of the main script.
@@ skipping 30 matching lines @@
   return true;
 }
 
 
 static void PrintUsage() {
   fprintf(stderr,
           "dart [<vm-flags>] <dart-script-file> [<dart-options>]\n");
 }
 
 
+char* BuildIsolateName(const char* script_name,
+                       const char* func_name) {
+  // Skip past any slashes in the script name.
+  const char* last_slash = strrchr(script_name, '/');
+  if (last_slash != NULL) {
+    script_name = last_slash + 1;
+  }

[siva, 2012/01/18 06:26:03]

Would skipping past slashes cause the name to be non unique?

[turnidge, 2012/01/18 21:29:21]

Yes and no.  If there are two dart scripts with the same file name but different
paths, then the name prefixes will be the same for both of them.  If we were to
include the full path of the script, it would make the name awkwardly long, so I
was trying to strike a balance of providing a prefix that would be usually
unique but still easy to read.

The name prefix here will get a number appended to it inside of isolate.cc, so
in the end then name will be unique regardless of the name prefix generated by
this code.

+
+  const char* kFormat = "%s/%s";
+  intptr_t len = strlen(script_name) + strlen(func_name) + 2;
+  char* buffer = new char[len];

[siva, 2012/01/18 06:26:03]

ASSERT(buffer != NULL);

[turnidge, 2012/01/18 21:29:21]

Done.

+  snprintf(buffer, len, kFormat, script_name, func_name);
+  return buffer;
+}
+
+
 int main(int argc, char** argv) {
   char* script_name;
   CommandLineOptions vm_options(argc);
   CommandLineOptions dart_options(argc);
 
   // Perform platform specific initialization.
   if (!Platform::Initialize()) {
     fprintf(stderr, "Initialization failed\n");
   }
 
@@ skipping 26 matching lines @@
   // created.
   if (use_script_snapshot) {
     if (!CaptureScriptSnapshot()) {
       return 255;  // Error capturing script snapshot, error already reported.
     }
   }
 
   // Call CreateIsolateAndSetup which creates an isolate and loads up
   // the specified application script.
   char* error = NULL;
-  if (!CreateIsolateAndSetup(NULL, &error)) {
+  char* isolate_name = BuildIsolateName(canonical_script_name, "main");
+  if (!CreateIsolateAndSetup(isolate_name, NULL, &error)) {
     fprintf(stderr, "%s\n", error);
     free(canonical_script_name);
     free(error);
     free(script_snapshot_buffer);
+    delete [] isolate_name;
     return 255;  // Indicates we encountered an error.
   }
+  free(script_snapshot_buffer);  // Don't need it anymore.
+  delete [] isolate_name;
 
-  free(script_snapshot_buffer);  // Don't need it anymore.
   Dart_Isolate isolate = Dart_CurrentIsolate();
   ASSERT(isolate != NULL);
   Dart_Handle result;
 
   Dart_EnterScope();
 
   if (has_compile_all) {
     result = Dart_CompileAll();
     if (Dart_IsError(result)) {
       fprintf(stderr, "%s\n", Dart_GetError(result));
       Dart_ExitScope();
       Dart_ShutdownIsolate();
       free(canonical_script_name);
       return 255;  // Indicates we encountered an error.
     }
   }
 
   // Create a dart options object that can be accessed from dart code.
   Dart_Handle options_result = SetupRuntimeOptions(&dart_options);
   if (Dart_IsError(options_result)) {
     fprintf(stderr, "%s\n", Dart_GetError(options_result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
-
   // Lookup the library of the main script.
   Dart_Handle script_url = Dart_NewString(canonical_script_name);
   Dart_Handle library = Dart_LookupLibrary(script_url);
   if (Dart_IsError(library)) {
     fprintf(stderr, "%s\n", Dart_GetError(library));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     free(canonical_script_name);
     return 255;  // Indicates we encountered an error.
   }
@@ skipping 51 matching lines @@
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate event handler.
   EventHandler::Terminate();
 
   return 0;
 }