Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/vm/object.cc

Issue 1132323002: Add Service ID zones to service protocol (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« runtime/vm/json_stream.h ('K') | « runtime/vm/json_stream.cc ('k') | runtime/vm/object_id_ring.h » ('j') | runtime/vm/object_id_ring.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index f4f90c6b9e0c26e5f416f1212526882cabb6c5d2..5e224552e766ea78fafd04774b2202978a2e0a81 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -32,7 +32,6 @@
#include "vm/heap.h"
#include "vm/intermediate_language.h"
#include "vm/intrinsifier.h"
-#include "vm/object_id_ring.h"
#include "vm/object_store.h"
#include "vm/parser.h"
#include "vm/report.h"
@@ -1601,9 +1600,7 @@ void Object::PrintJSON(JSONStream* stream, bool ref) const {
void Object::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "Object", JSONType(), ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
if (ref) {
return;
}
@@ -4420,10 +4417,8 @@ void TypeArguments::PrintJSONImpl(JSONStream* stream, bool ref) const {
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());
AddTypeProperties(&jsobj, "TypeArguments", JSONType(), ref);
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
const String& user_name = String::Handle(PrettyName());
const String& vm_name = String::Handle(Name());
AddNameProperties(&jsobj, user_name, vm_name);
@@ -6809,8 +6804,9 @@ const char* Function::ToCString() const {
}
-static const char* GetFunctionServiceId(const Function& f, const Class& cls) {
- Zone* zone = Isolate::Current()->current_zone();
+static void AddFunctionServiceId(const JSONObject& jsobj,
+ const Function& f,
+ const Class& cls) {
// Special kinds of functions use indices in their respective lists.
intptr_t id = -1;
const char* selector = NULL;
@@ -6826,22 +6822,22 @@ static const char* GetFunctionServiceId(const Function& f, const Class& cls) {
}
if (id != -1) {
ASSERT(selector != NULL);
- return zone->PrintToString("classes/%" Pd "/%s/%" Pd "",
- cls.id(), selector, id);
+ jsobj.AddPropertyF("id", "classes/%" Pd "/%s/%" Pd "",
+ cls.id(), selector, id);
+ return;
}
// Regular functions known to their owner use their name (percent-encoded).
String& name = String::Handle(f.name());
if (cls.LookupFunction(name) == f.raw()) {
name = String::EncodeIRI(name);
- return zone->PrintToString("classes/%" Pd "/functions/%s",
- cls.id(), name.ToCString());
+ jsobj.AddPropertyF("id", "classes/%" Pd "/functions/%s",
+ cls.id(), name.ToCString());
+ return;
}
// 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);
+ jsobj.AddServiceId("id", f);
}
@@ -6853,7 +6849,7 @@ void Function::PrintJSONImpl(JSONStream* stream, bool ref) const {
ASSERT(err.IsNull());
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "Function", JSONType(), ref);
- jsobj.AddProperty("id", GetFunctionServiceId(*this, cls));
+ AddFunctionServiceId(jsobj, *this, cls);
const String& user_name = String::Handle(PrettyName());
const String& vm_name = String::Handle(name());
AddNameProperties(&jsobj, user_name, vm_name);
@@ -8000,9 +7996,7 @@ void TokenStream::PrintJSONImpl(JSONStream* stream, bool ref) const {
AddTypeProperties(&jsobj, "Object", JSONType(), ref);
// TODO(johnmccutchan): Generate a stable id. TokenStreams hang off
// a Script object but do not have a back reference to generate a stable id.
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
if (ref) {
return;
}
@@ -10700,9 +10694,7 @@ void PcDescriptors::PrintToJSONObject(JSONObject* jsobj, bool ref) const {
AddTypeProperties(jsobj, "Object", JSONType(), ref);
// TODO(johnmccutchan): Generate a stable id. PcDescriptors hang off a Code
// object but do not have a back reference to generate an ID.
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj->AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj->AddServiceId("id", *this);
if (ref) {
return;
}
@@ -10983,9 +10975,7 @@ void LocalVarDescriptors::PrintJSONImpl(JSONStream* stream,
AddTypeProperties(&jsobj, "Object", JSONType(), ref);
// TODO(johnmccutchan): Generate a stable id. LocalVarDescriptors hang off
// a Code object but do not have a back reference to generate an ID.
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
if (ref) {
return;
}
@@ -12871,9 +12861,7 @@ void Context::PrintJSONImpl(JSONStream* stream, bool ref) const {
// TODO(turnidge): Should the user level type for Context be Context
// or Object?
AddTypeProperties(&jsobj, "Context", JSONType(), ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
jsobj.AddProperty("length", num_variables());
@@ -14075,15 +14063,13 @@ void Instance::PrintJSONImpl(JSONStream* stream, bool ref) const {
AddTypeProperties(&jsobj, "Instance", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
+ jsobj.AddServiceId("id", *this);
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;
}
@@ -15185,9 +15171,7 @@ void Type::PrintJSONImpl(JSONStream* stream, bool ref) const {
jsobj.AddPropertyF("id", "classes/%" Pd "/types/%" Pd "", cid, id);
jsobj.AddProperty("typeClass", type_cls);
} else {
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
}
const String& user_name = String::Handle(PrettyName());
const String& vm_name = String::Handle(Name());
@@ -15370,9 +15354,7 @@ void TypeRef::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "TypeRef", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
const String& user_name = String::Handle(PrettyName());
const String& vm_name = String::Handle(Name());
AddNameProperties(&jsobj, user_name, vm_name);
@@ -15606,9 +15588,7 @@ void TypeParameter::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "TypeParameter", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
const String& user_name = String::Handle(PrettyName());
const String& vm_name = String::Handle(Name());
AddNameProperties(&jsobj, user_name, vm_name);
@@ -15824,9 +15804,7 @@ void BoundedType::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "BoundedType", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
const String& user_name = String::Handle(PrettyName());
const String& vm_name = String::Handle(Name());
AddNameProperties(&jsobj, user_name, vm_name);
@@ -15929,9 +15907,7 @@ void Integer::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "int", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
jsobj.AddProperty("valueAsString", ToCString());
}
@@ -16624,9 +16600,7 @@ void Double::PrintJSONImpl(JSONStream* stream, bool ref) const {
// "Double". Return "double" instead.
AddTypeProperties(&jsobj, "double", "double", ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
jsobj.AddProperty("valueAsString", ToCString());
}
@@ -18217,9 +18191,7 @@ void String::PrintJSONImpl(JSONStream* stream, bool ref) const {
}
AddTypeProperties(&jsobj, "String", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
if (ref) {
bool did_truncate = jsobj.AddPropertyStr("valueAsString", *this, 128);
if (did_truncate) {
@@ -19242,9 +19214,7 @@ void Array::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "List", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
jsobj.AddProperty("length", Length());
if (ref) {
return;
@@ -19495,9 +19465,7 @@ void GrowableObjectArray::PrintJSONImpl(JSONStream* stream,
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "List", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
jsobj.AddProperty("length", Length());
if (ref) {
return;
@@ -20545,10 +20513,7 @@ void WeakProperty::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "Instance", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
-
+ jsobj.AddServiceId("id", *this);
if (ref) {
return;
}
@@ -20619,9 +20584,7 @@ void MirrorReference::PrintJSONImpl(JSONStream* stream, bool ref) const {
JSONObject jsobj(stream);
AddTypeProperties(&jsobj, "Instance", JSONType(), ref);
PrintSharedInstanceJSON(&jsobj, ref);
- ObjectIdRing* ring = Isolate::Current()->object_id_ring();
- const intptr_t id = ring->GetIdForObject(raw());
- jsobj.AddPropertyF("id", "objects/%" Pd "", id);
+ jsobj.AddServiceId("id", *this);
if (ref) {
return;
« runtime/vm/json_stream.h ('K') | « runtime/vm/json_stream.cc ('k') | runtime/vm/object_id_ring.h » ('j') | runtime/vm/object_id_ring.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698