| Index: runtime/vm/isolate.cc
|
| diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
|
| index 01fc835fd3e2fd43ce7246d4b16355aac89bb23d..8dd638d2f065646996bae31512b7ec49ed7f9cd2 100644
|
| --- a/runtime/vm/isolate.cc
|
| +++ b/runtime/vm/isolate.cc
|
| @@ -351,6 +351,8 @@ Isolate::Isolate()
|
| deopt_context_(NULL),
|
| stacktrace_(NULL),
|
| stack_frame_index_(-1),
|
| + timestamp_last_allocationprofile_accumulator_reset_(0),
|
| + timestamp_last_allocationprofile_gc_(0),
|
| cha_used_(false),
|
| object_id_ring_(NULL),
|
| trace_buffer_(NULL),
|
| @@ -936,15 +938,9 @@ void Isolate::PrintJSON(JSONStream* stream, bool ref) {
|
| }
|
| }
|
| {
|
| - JSONObject jsheap(&jsobj, "heap");
|
| - jsheap.AddProperty("usedNew",
|
| - heap()->UsedInWords(Heap::kNew) * kWordSize);
|
| - jsheap.AddProperty("capacityNew",
|
| - heap()->CapacityInWords(Heap::kNew) * kWordSize);
|
| - jsheap.AddProperty("usedOld",
|
| - heap()->UsedInWords(Heap::kOld) * kWordSize);
|
| - jsheap.AddProperty("capacityOld",
|
| - heap()->CapacityInWords(Heap::kOld) * kWordSize);
|
| + JSONObject jsheap(&jsobj, "heaps");
|
| + heap()->PrintToJSONObject(Heap::kNew, &jsheap);
|
| + heap()->PrintToJSONObject(Heap::kOld, &jsheap);
|
| }
|
|
|
| // TODO(turnidge): Don't compute a full stack trace every time we
|
|
|