Clean up output of heap object tracing

src/heap/heap.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/accessors.h"
 #include "src/api.h"
 #include "src/base/bits.h"
 #include "src/base/once.h"
@@ skipping 6273 matching lines @@
   if (clear_last_time_stats) {
     memset(object_counts_last_time_, 0, sizeof(object_counts_last_time_));
     memset(object_sizes_last_time_, 0, sizeof(object_sizes_last_time_));
   }
 }
 
 
 static base::LazyMutex object_stats_mutex = LAZY_MUTEX_INITIALIZER;
 
 
-static void TraceObjectStat(const char* name, int count, int size) {
-  if (size > 0) {
-    PrintF("%40s\tcount= %6d\t size= %6d kb\n", name, count, size);
-  }
+void Heap::TraceObjectStat(const char* name, int count, int size, double time) {
+  PrintPID("heap:%p, time:%f, gc:%d, type:%s, count:%d, size:%d\n",
+           static_cast<void*>(this), time, ms_count_, name, count, size);
 }
 
 
 void Heap::TraceObjectStats() {
   base::LockGuard<base::Mutex> lock_guard(object_stats_mutex.Pointer());
   int index;
   int count;
   int size;
   int total_size = 0;
+  double time = isolate_->time_millis_since_init();
 #define TRACE_OBJECT_COUNT(name)                     \
   count = static_cast<int>(object_counts_[name]);    \
   size = static_cast<int>(object_sizes_[name]) / KB; \
   total_size += size;                                \
-  TraceObjectStat(#name, count, size);
+  TraceObjectStat(#name, count, size, time);
   INSTANCE_TYPE_LIST(TRACE_OBJECT_COUNT)
 #undef TRACE_OBJECT_COUNT
 #define TRACE_OBJECT_COUNT(name)                      \
   index = FIRST_CODE_KIND_SUB_TYPE + Code::name;      \
   count = static_cast<int>(object_counts_[index]);    \
   size = static_cast<int>(object_sizes_[index]) / KB; \
-  TraceObjectStat("CODE_" #name, count, size);
+  TraceObjectStat("*CODE_" #name, count, size, time);
   CODE_KIND_LIST(TRACE_OBJECT_COUNT)
 #undef TRACE_OBJECT_COUNT
 #define TRACE_OBJECT_COUNT(name)                      \
   index = FIRST_FIXED_ARRAY_SUB_TYPE + name;          \
   count = static_cast<int>(object_counts_[index]);    \
   size = static_cast<int>(object_sizes_[index]) / KB; \
-  TraceObjectStat("FIXED_ARRAY_" #name, count, size);
+  TraceObjectStat("*FIXED_ARRAY_" #name, count, size, time);
   FIXED_ARRAY_SUB_INSTANCE_TYPE_LIST(TRACE_OBJECT_COUNT)
 #undef TRACE_OBJECT_COUNT
 #define TRACE_OBJECT_COUNT(name)                                              \
   index =                                                                     \
       FIRST_CODE_AGE_SUB_TYPE + Code::k##name##CodeAge - Code::kFirstCodeAge; \
   count = static_cast<int>(object_counts_[index]);                            \
   size = static_cast<int>(object_sizes_[index]) / KB;                         \
-  TraceObjectStat("CODE_AGE_" #name, count, size);
+  TraceObjectStat("*CODE_AGE_" #name, count, size, time);
   CODE_AGE_LIST_COMPLETE(TRACE_OBJECT_COUNT)
 #undef TRACE_OBJECT_COUNT
-  PrintF("Total size= %d kb\n", total_size);
 }
 
 
 void Heap::CheckpointObjectStats() {
   base::LockGuard<base::Mutex> lock_guard(object_stats_mutex.Pointer());
   Counters* counters = isolate()->counters();
 #define ADJUST_LAST_TIME_OBJECT_COUNT(name)              \
   counters->count_of_##name()->Increment(                \
       static_cast<int>(object_counts_[name]));           \
   counters->count_of_##name()->Decrement(                \
@@ skipping 42 matching lines @@
       static_cast<int>(object_sizes_last_time_[index]));
   CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT)
 #undef ADJUST_LAST_TIME_OBJECT_COUNT
 
   MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_));
   MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_));
   ClearObjectStats();
 }
 }
 }  // namespace v8::internal