Teach the Observatory about Contexts. Factor out object graph information from the instance view.

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 12423 matching lines @@
   const Context& parent_ctx = Context::Handle(parent());
   if (!parent_ctx.IsNull()) {
     parent_ctx.Dump(indent + 2);
   }
   IndentN(indent);
   OS::PrintErr("}\n");
 }
 
 
 void Context::PrintJSONImpl(JSONStream* stream, bool ref) const {
-  Object::PrintJSONImpl(stream, ref);
+  JSONObject jsobj(stream);
+  jsobj.AddProperty("type", JSONType(ref));
+  ObjectIdRing* ring = Isolate::Current()->object_id_ring();
+  const intptr_t id = ring->GetIdForObject(raw());
+  jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+
+  jsobj.AddProperty("length", num_variables());
+
+  if (ref) {
+    return;
+  }
+
+  Class& cls = Class::Handle(this->clazz());
+  jsobj.AddProperty("class", cls);
+
+  jsobj.AddProperty("size", raw()->Size());
+
+  const Context& parent_context = Context::Handle(parent());
+  jsobj.AddProperty("parent", parent_context);
+
+  JSONArray jsarr(&jsobj, "elements");

[Cutch, 2014/09/03 22:06:49]

Why not "variables" instead of "elements"?

[rmacnak, 2014/09/03 22:44:06]

Fixed.

+  for (intptr_t i = 0; i < num_variables(); i++) {
+    const Instance& var = Instance::Handle(At(i));
+    JSONObject jselement(&jsarr);
+    jselement.AddProperty("index", i);
+    jselement.AddProperty("value", var);
+  }
 }
 
 
 RawContextScope* ContextScope::New(intptr_t num_variables) {
   ASSERT(Object::context_scope_class() != Class::null());
   if (num_variables < 0 || num_variables > kMaxElements) {
     // This should be caught before we reach here.
     FATAL1("Fatal error in ContextScope::New: invalid num_variables %" Pd "\n",
            num_variables);
   }
@@ skipping 1157 matching lines @@
     jsobj.AddProperty("valueAsString", "<being initialized>");
     return;
   }
 
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   const intptr_t id = ring->GetIdForObject(raw());
   if (IsClosure()) {
     const Function& closureFunc = Function::Handle(Closure::function(*this));
     jsobj.AddProperty("closureFunc", closureFunc);
+    const Context& closureCtxt = Context::Handle(Closure::context(*this));
+    jsobj.AddProperty("closureCtxt", closureCtxt);
   }
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
   if (ref) {
     return;
   }
 }
 
 
 bool AbstractType::IsResolved() const {
   // AbstractType is an abstract class.
@@ skipping 6010 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart