Add an instance view page to the vmservice.

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 5878 matching lines @@
   const char* field_name = String::Handle(name()).ToCString();
   const Class& cls = Class::Handle(owner());
   const char* cls_name = String::Handle(cls.Name()).ToCString();
   intptr_t len =
       OS::SNPrint(NULL, 0, kFormat, cls_name, field_name, kF0, kF1, kF2) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, cls_name, field_name, kF0, kF1, kF2);
   return chars;
 }
 
+void Field::PrintToJSONStream(JSONStream* stream, bool ref) const {
+  PrintToJSONStreamWithInstance(stream, Object::null_instance(), ref);
+}
 
-void Field::PrintToJSONStream(JSONStream* stream, bool ref) const {
+
+void Field::PrintToJSONStreamWithInstance(JSONStream* stream,
+                                          const Instance& instance,
+                                          bool ref) const {
   JSONObject jsobj(stream);
   const char* internal_field_name = String::Handle(name()).ToCString();
   const char* field_name = String::Handle(UserVisibleName()).ToCString();
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   intptr_t id = ring->GetIdForObject(raw());
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddProperty("id", id);
   jsobj.AddProperty("name", internal_field_name);
   jsobj.AddProperty("user_name", field_name);
   if (is_static()) {
     const Object& valueObj = Object::Handle(value());
     jsobj.AddProperty("value", valueObj);
+  } else if (!instance.IsNull()) {
+    const Object& valueObj = Object::Handle(instance.GetField(*this));
+    jsobj.AddProperty("value", valueObj);
   }
   Class& cls = Class::Handle(owner());
   jsobj.AddProperty("owner", cls);
   AbstractType& declared_type = AbstractType::Handle(type());
   cls = declared_type.type_class();
   jsobj.AddProperty("declared_type", cls);
   jsobj.AddProperty("static", is_static());
   jsobj.AddProperty("final", is_final());
   jsobj.AddProperty("const", is_const());
   if (ref) {
@@ skipping 5492 matching lines @@
 
 
 void Instance::PrintToJSONStream(JSONStream* stream, bool ref) const {
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   intptr_t id = ring->GetIdForObject(raw());
 
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddProperty("id", id);
 
+  Class& cls = Class::Handle(this->clazz());
+  jsobj.AddProperty("class", cls);
+
   // Set the "preview" property for this instance.
   if (IsNull()) {
     jsobj.AddProperty("preview", "null");
-  } else if (raw() == Object::sentinel().raw() ||
-             raw() == Object::transition_sentinel().raw()) {
-    jsobj.AddProperty("preview", "<uninitialized>");
   } else {
-    // TODO(turnidge): Handle special characters?  Truncate?
-    jsobj.AddProperty("preview", ToCString());
+    jsobj.AddProperty("preview", ToUserCString(40));
+  }
+  if (ref) {
+    return;
+  }
+
+  // Walk the superclass chain, adding all instance fields.
+  {
+    JSONArray jsarr(&jsobj, "fields");
+    while (!cls.IsNull()) {
+      const Array& field_array = Array::Handle(cls.fields());
+      Field& field = Field::Handle();
+      if (!field_array.IsNull()) {
+        for (intptr_t i = 0; i < field_array.Length(); i++) {
+          field ^= field_array.At(i);
+          if (!field.is_static()) {
+            jsarr.AddValue(field, *this);
+          }
+        }
+      }
+      cls = cls.SuperClass();
+    }
   }
 }
 
 
 bool AbstractType::IsResolved() const {
   // AbstractType is an abstract class.
   UNREACHABLE();
   return false;
 }
 
@@ skipping 4714 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart