Visual refresh of allocation profile page

runtime/vm/isolate.cc

 // Copyright (c) 2013, 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/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/json.h"
 #include "lib/mirrors.h"
@@ skipping 333 matching lines @@
       stack_overflow_count_(0),
       message_handler_(NULL),
       spawn_state_(NULL),
       is_runnable_(false),
       gc_prologue_callback_(NULL),
       gc_epilogue_callback_(NULL),
       defer_finalization_count_(0),
       deopt_context_(NULL),
       stacktrace_(NULL),
       stack_frame_index_(-1),
+      last_allocationprofile_accumulator_reset_timestamp_(0),
+      last_allocationprofile_gc_timestamp_(0),
       cha_used_(false),
       object_id_ring_(NULL),
       trace_buffer_(NULL),
       profiler_data_(NULL),
       thread_state_(NULL),
       tag_table_(GrowableObjectArray::null()),
       current_tag_(UserTag::null()),
       next_(NULL),
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
@@ skipping 565 matching lines @@
   }
   if (state != NULL) {
     const Object& entry = Object::Handle(this, state->ResolveFunction());
     if (!entry.IsNull() && entry.IsFunction()) {
       Function& func = Function::Handle(this);
       func ^= entry.raw();
       jsobj.AddProperty("entry", func);
     }
   }
   {
-    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
   // request an isolate's info.
   DebuggerStackTrace* stack = debugger()->StackTrace();
   if (stack->Length() > 0) {
     JSONObject jsframe(&jsobj, "topFrame");
 
     ActivationFrame* frame = stack->FrameAt(0);
     frame->PrintToJSONObject(&jsobj);
@@ skipping 282 matching lines @@
   return func.raw();
 }
 
 
 void IsolateSpawnState::Cleanup() {
   SwitchIsolateScope switch_scope(isolate());
   Dart::ShutdownIsolate();
 }
 
 }  // namespace dart