vmservice protocol cleanup

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 4073 matching lines @@
   return chars;
 }
 
 
 void Class::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   if ((raw() == Class::null()) || (id() == kFreeListElement)) {
     jsobj.AddProperty("type", "Null");
     return;
   }
-  const char* internal_class_name = String::Handle(Name()).ToCString();
-  const char* pretty_class_name =
-      String::Handle(PrettyName()).ToCString();
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "classes/%" Pd "", id());
-  jsobj.AddProperty("name", internal_class_name);
-  jsobj.AddProperty("user_name", pretty_class_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(Name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   if (ref) {
     return;
   }
 
   const Error& err = Error::Handle(EnsureIsFinalized(Isolate::Current()));
   if (!err.IsNull()) {
     jsobj.AddProperty("error", err);
   }
   jsobj.AddProperty("implemented", is_implemented());
   jsobj.AddProperty("abstract", is_abstract());
@@ skipping 60 matching lines @@
         for (intptr_t i = 0; i < subclasses.Length(); ++i) {
           // TODO(turnidge): Use the Type directly once regis has added
           // types to the vmservice.
           subclass ^= subclasses.At(i);
           subclasses_array.AddValue(subclass);
         }
       }
     }
   }
   {
-    JSONObject typesRef(&jsobj, "canonicalTypes");
-    typesRef.AddProperty("type", "@TypeList");
-    typesRef.AddPropertyF("id", "classes/%" Pd "/types", id());
-    jsobj.AddPropertyF("name", "canonical types of %s", internal_class_name);
-    jsobj.AddPropertyF("user_name", "canonical types of %s", pretty_class_name);
-  }
-  {
     ClassTable* class_table = Isolate::Current()->class_table();
     const ClassHeapStats* stats = class_table->StatsWithUpdatedSize(id());
     if (stats != NULL) {
       JSONObject allocation_stats(&jsobj, "allocationStats");
       stats->PrintToJSONObject(*this, &allocation_stats);
     }
   }
 }
 
 
@@ skipping 237 matching lines @@
   // the object id (as in typearguments/id), because the indices are not
   // preserved when the table grows and the entries get rehashed. Use the ring.
   Isolate* isolate = Isolate::Current();
   ObjectStore* object_store = isolate->object_store();
   const Array& table = Array::Handle(object_store->canonical_type_arguments());
   ASSERT(table.Length() > 0);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   const intptr_t id = ring->GetIdForObject(raw());
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
-  const char* name = String::Handle(Name()).ToCString();
-  const char* pretty_name = String::Handle(PrettyName()).ToCString();
-  jsobj.AddProperty("name", name);
-  jsobj.AddProperty("user_name", pretty_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(Name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());

[Cutch, 2014/08/25 17:54:52]

Maybe:

jsobj.AddName(user_name, vm_name);

[turnidge, 2014/08/25 18:20:09]

Done, but with a static function:

AddNameProperties(&jsobj, user_name, vm_name);

+  }
   jsobj.AddProperty("length", Length());
   jsobj.AddProperty("num_instantiations", NumInstantiations());
   if (ref) {
     return;
   }
   {
     JSONArray jsarr(&jsobj, "types");
     AbstractType& type_arg = AbstractType::Handle();
     for (intptr_t i = 0; i < Length(); i++) {
       type_arg = TypeAt(i);
@@ skipping 2323 matching lines @@
   // Oddball functions (not known to their owner) fall back to use the object
   // id ring. Current known examples are signature functions of closures
   // and stubs like 'megamorphic_miss'.
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   id = ring->GetIdForObject(f.raw());
   return zone->PrintToString("objects/%" Pd "", id);
 }
 
 
 void Function::PrintJSONImpl(JSONStream* stream, bool ref) const {
-  const char* internal_name = String::Handle(name()).ToCString();
-  const char* pretty_name =
-      String::Handle(PrettyName()).ToCString();
   Class& cls = Class::Handle(Owner());
   ASSERT(!cls.IsNull());
   Error& err = Error::Handle();
   err ^= cls.EnsureIsFinalized(Isolate::Current());
   ASSERT(err.IsNull());
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddProperty("id", GetFunctionServiceId(*this, cls));
-  jsobj.AddProperty("name", internal_name);
-  jsobj.AddProperty("user_name", pretty_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   if (cls.IsTopLevel()) {
     const Library& library = Library::Handle(cls.library());
     jsobj.AddProperty("owningLibrary", library);
   } else {
     jsobj.AddProperty("owningClass", cls);
   }
   const Function& parent = Function::Handle(parent_function());
   if (!parent.IsNull()) {
     jsobj.AddProperty("parent", parent);
   }
@@ skipping 317 matching lines @@
   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::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
-  const char* internal_field_name = String::Handle(name()).ToCString();
-  const char* field_name = String::Handle(PrettyName()).ToCString();
   Class& cls = Class::Handle(owner());
   intptr_t id = cls.FindFieldIndex(*this);
   ASSERT(id >= 0);
   intptr_t cid = cls.id();
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "classes/%" Pd "/fields/%" Pd "", cid, id);
-  jsobj.AddProperty("name", internal_field_name);
-  jsobj.AddProperty("user_name", field_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   if (is_static()) {
     const Instance& valueObj = Instance::Handle(value());
     jsobj.AddProperty("value", valueObj);
   }
 
   if (cls.IsTopLevel()) {
     const Library& library = Library::Handle(cls.library());
     jsobj.AddProperty("owner", library);
   } else {
     jsobj.AddProperty("owner", cls);
@@ skipping 1303 matching lines @@
   jsobj.AddProperty("type", JSONType(ref));
   const String& name = String::Handle(url());
   ASSERT(!name.IsNull());
   const String& encoded_url = String::Handle(String::EncodeIRI(name));
   ASSERT(!encoded_url.IsNull());
   const Library& lib = Library::Handle(FindLibrary());
   intptr_t lib_index = (lib.IsNull()) ? -1 : lib.index();
   jsobj.AddPropertyF("id", "libraries/%" Pd "/scripts/%s",
       lib_index, encoded_url.ToCString());
   jsobj.AddProperty("name", name.ToCString());
-  jsobj.AddProperty("user_name", name.ToCString());
   jsobj.AddProperty("kind", GetKindAsCString());
   if (ref) {
     return;
   }
   jsobj.AddProperty("owning_library", lib);
   const String& source = String::Handle(Source());
   jsobj.AddProperty("source", source.ToCString());
 
   // Print the line number table
   {
@@ skipping 1265 matching lines @@
 }
 
 
 void Library::PrintJSONImpl(JSONStream* stream, bool ref) const {
   const char* library_name = String::Handle(name()).ToCString();
   intptr_t id = index();
   ASSERT(id >= 0);
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "libraries/%" Pd "", id);
-  jsobj.AddProperty("user_name", library_name);
   jsobj.AddProperty("name", library_name);
   const char* library_url = String::Handle(url()).ToCString();
   jsobj.AddProperty("url", library_url);
   if (ref) {
     return;
   }
   {
     JSONArray jsarr(&jsobj, "classes");
     ClassDictionaryIterator class_iter(*this);
     Class& klass = Class::Handle();
@@ skipping 2499 matching lines @@
 void Code::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", JSONType(ref));
   jsobj.AddPropertyF("id", "code/%" Px64"-%" Px "", compile_timestamp(),
                      EntryPoint());
   jsobj.AddPropertyF("start", "%" Px "", EntryPoint());
   jsobj.AddPropertyF("end", "%" Px "", EntryPoint() + Size());
   jsobj.AddProperty("isOptimized", is_optimized());
   jsobj.AddProperty("isAlive", is_alive());
   jsobj.AddProperty("kind", "Dart");
-  const String& name = String::Handle(Name());
-  const String& pretty_name = String::Handle(PrettyName());
-  jsobj.AddProperty("name", name.ToCString());
-  jsobj.AddProperty("user_name", pretty_name.ToCString());
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(Name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   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("user_name", pretty_name.ToCString());
-    func.AddProperty("name", name.ToCString());
+    func.AddProperty("name", user_name.ToCString());
+    if (!user_name.Equals(vm_name)) {
+      func.AddProperty("vmName", vm_name.ToCString());
+    }
   }
   if (ref) {
     return;
   }
   const Array& array = Array::Handle(ObjectPool());
   jsobj.AddProperty("object_pool", array);
   {
     JSONArray jsarr(&jsobj, "disassembly");
     if (is_alive()) {
       // Only disassemble alive code objects.
@@ skipping 2374 matching lines @@
     intptr_t id = type_cls.FindCanonicalTypeIndex(*this);
     ASSERT(id >= 0);
     intptr_t cid = type_cls.id();
     jsobj.AddPropertyF("id", "classes/%" Pd "/types/%" Pd "", cid, id);
     jsobj.AddProperty("type_class", type_cls);
   } else {
     ObjectIdRing* ring = Isolate::Current()->object_id_ring();
     const intptr_t id = ring->GetIdForObject(raw());
     jsobj.AddPropertyF("id", "objects/%" Pd "", id);
   }
-  const char* name = String::Handle(Name()).ToCString();
-  const char* pretty_name = String::Handle(PrettyName()).ToCString();
-  jsobj.AddProperty("name", name);
-  jsobj.AddProperty("user_name", pretty_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(Name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   if (ref) {
     return;
   }
   jsobj.AddProperty("type_arguments", TypeArguments::Handle(arguments()));
 }
 
 
 bool TypeRef::IsInstantiated(GrowableObjectArray* trail) const {
   if (TestAndAddToTrail(&trail)) {
     return true;
@@ skipping 140 matching lines @@
   }
 }
 
 
 void TypeRef::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   const intptr_t id = ring->GetIdForObject(raw());
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
-  const char* name = String::Handle(Name()).ToCString();
-  const char* pretty_name = String::Handle(PrettyName()).ToCString();
-  jsobj.AddProperty("name", name);
-  jsobj.AddProperty("user_name", pretty_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(Name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   if (ref) {
     return;
   }
   jsobj.AddProperty("ref_type", AbstractType::Handle(type()));
 }
 
 
 void TypeParameter::set_is_finalized() const {
   ASSERT(!IsFinalized());
   set_type_state(RawTypeParameter::kFinalizedUninstantiated);
@@ skipping 193 matching lines @@
   return chars;
 }
 
 
 void TypeParameter::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   const intptr_t id = ring->GetIdForObject(raw());
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
-  const char* name = String::Handle(Name()).ToCString();
-  const char* pretty_name = String::Handle(PrettyName()).ToCString();
-  jsobj.AddProperty("name", name);
-  jsobj.AddProperty("user_name", pretty_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(Name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   const Class& param_cls = Class::Handle(parameterized_class());
   jsobj.AddProperty("parameterized_class", param_cls);
   if (ref) {
     return;
   }
   jsobj.AddProperty("index", index());
   const AbstractType& upper_bound = AbstractType::Handle(bound());
   jsobj.AddProperty("upper_bound", upper_bound);
 }
 
@@ skipping 180 matching lines @@
   return chars;
 }
 
 
 void BoundedType::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   PrintSharedInstanceJSON(&jsobj, ref);
   ObjectIdRing* ring = Isolate::Current()->object_id_ring();
   const intptr_t id = ring->GetIdForObject(raw());
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
-  const char* name = String::Handle(Name()).ToCString();
-  const char* pretty_name = String::Handle(PrettyName()).ToCString();
-  jsobj.AddProperty("name", name);
-  jsobj.AddProperty("user_name", pretty_name);
+  const String& user_name = String::Handle(PrettyName());
+  const String& vm_name = String::Handle(Name());
+  jsobj.AddProperty("name", user_name.ToCString());
+  if (!user_name.Equals(vm_name)) {
+    jsobj.AddProperty("vmName", vm_name.ToCString());
+  }
   if (ref) {
     return;
   }
   jsobj.AddProperty("bounded_type", AbstractType::Handle(type()));
   jsobj.AddProperty("upper_bound", AbstractType::Handle(bound()));
 }
 
 
 intptr_t MixinAppType::token_pos() const {
   return AbstractType::Handle(MixinTypeAt(0)).token_pos();
@@ skipping 4296 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart