Add a VM page to the observatory.

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 "lib/mirrors.h"
@@ skipping 842 matching lines @@
 
 
 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor,
                                          bool visit_prologue_weak_handles) {
   if (api_state() != NULL) {
     api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles);
   }
 }
 
 
-void Isolate::PrintToJSONStream(JSONStream* stream) {
+void Isolate::PrintToJSONStream(JSONStream* stream, bool ref) {
   JSONObject jsobj(stream);
-  jsobj.AddProperty("type", "Isolate");
+  jsobj.AddProperty("type", (ref ? "@Isolate" : "Isolate"));
   jsobj.AddPropertyF("id", "isolates/%" Pd "",
                      static_cast<intptr_t>(main_port()));
-  jsobj.AddPropertyF("name", "%" Pd "",
+  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());
+  }
+  if (ref) {
+    return;
+  }
   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, "heap");
@@ skipping 11 matching lines @@
     frame->PrintToJSONObject(&jsobj);
     // TODO(turnidge): Implement depth differently -- differentiate
     // inlined frames.
     jsobj.AddProperty("depth", (intptr_t)0);
   }
   intptr_t live_ports = message_handler()->live_ports();
   intptr_t control_ports = message_handler()->control_ports();
   bool paused_on_exit = message_handler()->paused_on_exit();
   bool pause_on_start = message_handler()->pause_on_start();
   bool pause_on_exit = message_handler()->pause_on_exit();
-  jsobj.AddProperty("live_ports", live_ports);
-  jsobj.AddProperty("control_ports", control_ports);
-  jsobj.AddProperty("paused_on_exit", paused_on_exit);
-  jsobj.AddProperty("paused_on_start", pause_on_start);
-  jsobj.AddProperty("pause_on_exit", pause_on_exit);
+  jsobj.AddProperty("livePorts", live_ports);
+  jsobj.AddProperty("controlPorts", control_ports);
+  jsobj.AddProperty("pausedOnStart", pause_on_start);
+  jsobj.AddProperty("pausedOnExit", paused_on_exit);
+  jsobj.AddProperty("pauseOnExit", pause_on_exit);
   const Library& lib =
       Library::Handle(object_store()->root_library());
   jsobj.AddProperty("rootLib", lib);
 
   timer_list().PrintTimersToJSONProperty(&jsobj);
 
   {
     JSONObject typeargsRef(&jsobj, "canonicalTypeArguments");
     typeargsRef.AddProperty("type", "@TypeArgumentsList");
     typeargsRef.AddProperty("id", "typearguments");
@@ skipping 164 matching lines @@
   return func.raw();
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(isolate());
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart