Allow Observatory debugger to switch isolates.

runtime/vm/isolate.cc

 // Copyright (c) 2013, 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 "vm/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "vm/code_observers.h"
@@ skipping 521 matching lines @@
 #endif  // defined(DEBUG)
 
 #define REUSABLE_HANDLE_INITIALIZERS(object)                                   \
   object##_handle_(NULL),
 
 Isolate::Isolate()
     : vm_tag_(0),
       store_buffer_(),
       message_notify_callback_(NULL),
       name_(NULL),
+      debugger_name_(NULL),
       start_time_(OS::GetCurrentTimeMicros()),
       main_port_(0),
       origin_id_(0),
       pause_capability_(0),
       terminate_capability_(0),
       errors_fatal_(true),
       heap_(NULL),
       object_store_(NULL),
       top_exit_frame_info_(0),
       init_callback_data_(NULL),
@@ skipping 47 matching lines @@
   set_vm_tag(VMTag::kIdleTagId);
   set_user_tag(UserTags::kDefaultUserTag);
 }
 
 Isolate::Isolate(Isolate* original)
     : vm_tag_(0),
       store_buffer_(true),
       class_table_(original->class_table()),
       message_notify_callback_(NULL),
       name_(NULL),
+      debugger_name_(NULL),
       start_time_(OS::GetCurrentTimeMicros()),
       main_port_(0),
       pause_capability_(0),
       terminate_capability_(0),
       errors_fatal_(true),
       heap_(NULL),
       object_store_(NULL),
       top_exit_frame_info_(0),
       init_callback_data_(NULL),
       environment_callback_(NULL),
@@ skipping 38 matching lines @@
       next_(NULL),
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
       reusable_handles_() {
 }
 #undef REUSABLE_HANDLE_SCOPE_INIT
 #undef REUSABLE_HANDLE_INITIALIZERS
 
 Isolate::~Isolate() {
   free(name_);
+  free(debugger_name_);
   delete heap_;
   delete object_store_;
   delete api_state_;
   delete stub_code_;
   delete debugger_;
 #if defined(USING_SIMULATOR)
   delete simulator_;
 #endif
   delete mutex_;
   mutex_ = NULL;  // Fail fast if interrupts are scheduled on a dead isolate.
@@ skipping 85 matching lines @@
 #if defined(DEBUG)
   // Verify that we are never reusing a live origin id.
   VerifyOriginId id_verifier(result->main_port());
   Isolate::VisitIsolates(&id_verifier);
 #endif
   result->set_origin_id(result->main_port());
   result->set_pause_capability(result->random()->NextUInt64());
   result->set_terminate_capability(result->random()->NextUInt64());
 
   result->BuildName(name_prefix);
-
   result->debugger_ = new Debugger();
   result->debugger_->Initialize(result);
   if (FLAG_trace_isolates) {
     if (name_prefix == NULL || strcmp(name_prefix, "vm-isolate") != 0) {
       OS::Print("[+] Starting isolate:\n"
                 "\tisolate:    %s\n", result->name());
     }
   }
 
   // Add to isolate list.
@@ skipping 23 matching lines @@
   uword stack_allocated_local_address = reinterpret_cast<uword>(&func);
   return stack_allocated_local_address;
 #endif
 #else
   uword stack_allocated_local_address = reinterpret_cast<uword>(&func);
   return stack_allocated_local_address;
 #endif
 }
 
 
+void Isolate::set_debugger_name(const char* name) {
+  free(debugger_name_);
+  debugger_name_ = strdup(name);
+}
+
+
 void Isolate::BuildName(const char* name_prefix) {
   ASSERT(name_ == NULL);
   if (name_prefix == NULL) {
     name_prefix = "isolate";
   }
+  set_debugger_name(name_prefix);
   if (ServiceIsolate::NameEquals(name_prefix)) {
     name_ = strdup(name_prefix);
     return;
   }
   const char* kFormat = "%s-%lld";
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, name_prefix, main_port()) + 1;
   name_ = reinterpret_cast<char*>(malloc(len));
   OS::SNPrint(name_, len, kFormat, name_prefix, main_port());
 }
 
@@ skipping 91 matching lines @@
     // as 'load in progres'. Set the status to 'loaded'.
     if (lib.LoadInProgress()) {
       lib.SetLoaded();
     }
   }
 }
 
 
 bool Isolate::MakeRunnable() {
   ASSERT(Isolate::Current() == NULL);
+
   MutexLocker ml(mutex_);
   // Check if we are in a valid state to make the isolate runnable.
   if (is_runnable_ == true) {
     return false;  // Already runnable.
   }
   // Set the isolate as runnable and if we are being spawned schedule
   // isolate on thread pool for execution.
   is_runnable_ = true;
   if (!ServiceIsolate::IsServiceIsolate(this)) {
     message_handler()->set_pause_on_start(FLAG_pause_isolates_on_start);
@@ skipping 586 matching lines @@
 void Isolate::PrintJSON(JSONStream* stream, bool ref) {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", (ref ? "@Isolate" : "Isolate"));
   jsobj.AddPropertyF("id", "isolates/%" Pd "",
                      static_cast<intptr_t>(main_port()));
   jsobj.AddPropertyF("mainPort", "%" Pd "",
                      static_cast<intptr_t>(main_port()));
 
   // Assign an isolate name based on the entry function.
   IsolateSpawnState* state = spawn_state();
-  if (state == NULL) {
-    jsobj.AddPropertyF("name", "root");
-  } else if (state->class_name() != NULL) {
-    jsobj.AddPropertyF("name", "%s.%s",
-                       state->class_name(),
-                       state->function_name());
-  } else {
-    jsobj.AddPropertyF("name", "%s", state->function_name());
-  }
+  jsobj.AddProperty("name", debugger_name());
+  jsobj.AddPropertyF("number", "%" Pd "",

[Cutch, 2015/03/18 20:05:48]

This is the same as "mainPort" above. Consider dropping it or if you keep it,
rename it to something more descriptive than "number", for example, "debugId".

[turnidge, 2015/03/26 17:46:58]

Dropped mainPort.  Leaving number as-is for now after offline discussion.

+                     static_cast<intptr_t>(main_port()));
   if (ref) {
     return;
   }
+  int64_t start_time_millis = start_time() / kMicrosecondsPerMillisecond;
+  jsobj.AddProperty64("startTime", start_time_millis);
   if (state != NULL) {
     const Object& entry = Object::Handle(this, state->ResolveFunction());
     if (!entry.IsNull() && entry.IsFunction()) {
       Function& func = Function::Handle(this);
       func ^= entry.raw();
       jsobj.AddProperty("entry", func);
     }
   }
   {
     JSONObject jsheap(&jsobj, "heaps");
@@ skipping 409 matching lines @@
                            serialized_message_, serialized_message_len_);
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(I);
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart