Improved profiler view and inclusive profile tree

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 12496 matching lines @@
     ASSERT(!cls_name.IsNull());
     return String::Concat(Symbols::AllocationStubFor(), cls_name);
   } else {
     ASSERT(obj.IsFunction());
     // Dart function.
     return Function::Cast(obj).QualifiedPrettyName();
   }
 }
 
 
+bool Code::IsAllocationStubCode() const {
+  const Object& obj = Object::Handle(owner());
+  return obj.IsClass();
+}
+
+
+bool Code::IsStubCode() const {
+  const Object& obj = Object::Handle(owner());
+  return obj.IsNull();
+}
+
+
+bool Code::IsFunctionCode() const {
+  const Object& obj = Object::Handle(owner());
+  return obj.IsFunction();
+}
+
+
 void Code::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   AddTypeProperties(&jsobj, "Code", JSONType(), ref);
   jsobj.AddPropertyF("id", "code/%" Px64"-%" Px "", compile_timestamp(),
                      EntryPoint());
   jsobj.AddPropertyF("start", "%" Px "", EntryPoint());
   jsobj.AddPropertyF("end", "%" Px "", EntryPoint() + Size());
   jsobj.AddProperty("optimized", is_optimized());
   jsobj.AddProperty("alive", is_alive());
-  jsobj.AddProperty("kind", "Dart");
+  const Object& obj = Object::Handle(owner());
+  const bool is_stub = IsStubCode() || IsAllocationStubCode();
+  if (is_stub) {
+    jsobj.AddProperty("kind", "Stub");
+  } else {
+    jsobj.AddProperty("kind", "Dart");
+  }
   const String& user_name = String::Handle(PrettyName());
   const String& vm_name = String::Handle(Name());
   AddNameProperties(&jsobj, user_name, vm_name);
-  const Object& obj = Object::Handle(owner());
   if (obj.IsFunction()) {
     jsobj.AddProperty("function", obj);
   } else {
     // Generate a fake function reference.
     JSONObject func(&jsobj, "function");
     func.AddProperty("type", "@Function");
     func.AddProperty("kind", "Stub");
-    func.AddPropertyF("id", "functions/stub-%" Pd "", EntryPoint());
     func.AddProperty("name", user_name.ToCString());
     AddNameProperties(&func, user_name, vm_name);
   }
   if (ref) {
     return;
   }
   const Array& array = Array::Handle(ObjectPool());
   jsobj.AddProperty("objectPool", array);
   {
     JSONArray jsarr(&jsobj, "disassembly");
@@ skipping 8123 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart