Merge the Merlin heap tracing to top-of-trunk.

runtime/vm/pages.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/pages.h"
 
 #include "platform/assert.h"
 #include "vm/gc_marker.h"
 #include "vm/gc_sweeper.h"
+#include "vm/heap_trace.h"
 #include "vm/object.h"
 #include "vm/virtual_memory.h"
 
 namespace dart {
 
 DEFINE_FLAG(int, heap_growth_space_ratio, 10,
             "The desired maximum percentage of free space after GC");
 DEFINE_FLAG(int, heap_growth_time_ratio, 3,
             "The desired maximum percentage of time spent in GC");
 DEFINE_FLAG(int, heap_growth_rate, 4,
@@ skipping 372 matching lines @@
 }
 
 
 void PageSpace::MarkSweep(bool invoke_api_callbacks, const char* gc_reason) {
   // MarkSweep is not reentrant. Make sure that is the case.
   ASSERT(!sweeping_);
   sweeping_ = true;
   Isolate* isolate = Isolate::Current();
   NoHandleScope no_handles(isolate);
 
+  if (HeapTrace::is_enabled()) {
+    isolate->heap()->trace()->TraceMarkSweepStart();
+  }
+
   if (FLAG_print_free_list_before_gc) {
     OS::Print("Data Freelist:\n");
     freelist_[HeapPage::kData].Print();
     OS::Print("Executable Freelist:\n");
     freelist_[HeapPage::kExecutable].Print();
   }
 
   if (FLAG_verify_before_gc) {
     OS::PrintErr("Verifying before MarkSweep...");
     heap_->Verify();
@@ skipping 75 matching lines @@
     OS::Print("Executable Freelist:\n");
     freelist_[HeapPage::kExecutable].Print();
   }
 
   if (FLAG_verify_after_gc) {
     OS::PrintErr("Verifying after MarkSweep...");
     heap_->Verify();
     OS::PrintErr(" done.\n");
   }
 
+  if (HeapTrace::is_enabled()) {
+    isolate->heap()->trace()->TraceMarkSweepFinish();
+  }
+
   count_++;
   // Done, reset the marker.
   ASSERT(sweeping_);
   sweeping_ = false;
 }
 
 
 PageSpaceController::PageSpaceController(int heap_growth_ratio,
                                          int heap_growth_rate,
                                          int garbage_collection_time_ratio)
@@ skipping 112 matching lines @@
     return 0;
   } else {
     ASSERT(total_time >= gc_time);
     int result= static_cast<int>((static_cast<double>(gc_time) /
                              static_cast<double>(total_time)) * 100);
     return result;
   }
 }
 
 }  // namespace dart