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

runtime/vm/scavenger.cc

 // Copyright (c) 2011, 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/scavenger.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 154 matching lines @@
           delayed_weak_stack_.Add(it->second);
         }
         delay_set_.erase(ret.first, ret.second);
       }
       intptr_t size = raw_obj->Size();
       // Check whether object should be promoted.
       if (scavenger_->survivor_end_ <= raw_addr) {
         // Not a survivor of a previous scavenge. Just copy the object into the
         // to space.
         new_addr = scavenger_->TryAllocate(size);
+        if (HeapTrace::is_enabled()) {
+          heap_->trace()->TraceCopy(raw_addr, new_addr);
+        }
       } else {
         // TODO(iposva): Experiment with less aggressive promotion. For example
         // a coin toss determines if an object is promoted or whether it should
         // survive in this generation.
         //
         // This object is a survivor of a previous scavenge. Attempt to promote
         // the object.
         new_addr = heap_->TryAllocate(size, Heap::kOld, growth_policy_);
         if (new_addr != 0) {
           // If promotion succeeded then we need to remember it so that it can
           // be traversed later.
           scavenger_->PushToPromotedStack(new_addr);
           bytes_promoted_ += size;
+          if (HeapTrace::is_enabled()) {
+            heap_->trace()->TracePromotion(raw_addr, new_addr);
+          }
         } else if (!scavenger_->had_promotion_failure_) {
           // Signal a promotion failure and set the growth policy for
           // this, and all subsequent promotion allocations, to force
           // growth.
           scavenger_->had_promotion_failure_ = true;
           growth_policy_ = PageSpace::kForceGrowth;
           new_addr = heap_->TryAllocate(size, Heap::kOld, growth_policy_);
           if (new_addr != 0) {
             scavenger_->PushToPromotedStack(new_addr);
             bytes_promoted_ += size;
+            if (HeapTrace::is_enabled()) {
+              heap_->trace()->TracePromotion(raw_addr, new_addr);
+            }
           } else {
             // Promotion did not succeed. Copy into the to space
             // instead.
             new_addr = scavenger_->TryAllocate(size);
+            if (HeapTrace::is_enabled()) {
+              heap_->trace()->TraceCopy(raw_addr, new_addr);
+            }
           }
         } else {
           ASSERT(growth_policy_ == PageSpace::kForceGrowth);
           // Promotion did not succeed. Copy into the to space instead.
           new_addr = scavenger_->TryAllocate(size);
+          if (HeapTrace::is_enabled()) {
+            heap_->trace()->TraceCopy(raw_addr, new_addr);
+          }
         }
       }
       // During a scavenge we always succeed to at least copy all of the
       // current objects to the to space.
       ASSERT(new_addr != 0);
       // Copy the object to the new location.
       memmove(reinterpret_cast<void*>(new_addr),
               reinterpret_cast<void*>(raw_addr),
               size);
       // Remember forwarding address.
@@ skipping 411 matching lines @@
 
   if (FLAG_verify_before_gc) {
     OS::PrintErr("Verifying before Scavenge...");
     heap_->Verify();
     OS::PrintErr(" done.\n");
   }
 
   if (FLAG_verbose_gc) {
     OS::PrintErr("Start scavenge for %s collection\n", gc_reason);
   }
+  uword prev_first_obj_start = FirstObjectStart();
+  uword prev_top_addr = *(TopAddress());
   Timer timer(FLAG_verbose_gc, "Scavenge");
   timer.Start();
 
   intptr_t in_use_before = in_use();
 
   // Setup the visitor and run a scavenge.
   ScavengerVisitor visitor(isolate, this);
   Prologue(isolate, invoke_api_callbacks);
   IterateRoots(isolate, &visitor, !invoke_api_callbacks);
   ProcessToSpace(&visitor);
@@ skipping 25 matching lines @@
                  (visitor.bytes_promoted() + KB2) / KB,
                  promoted);
   }
 
   if (FLAG_verify_after_gc) {
     OS::PrintErr("Verifying after Scavenge...");
     heap_->Verify();
     OS::PrintErr(" done.\n");
   }
 
+  if (HeapTrace::is_enabled()) {
+    heap_->trace()->TraceDeathRange(prev_first_obj_start, prev_top_addr);
+  }
+
   count_++;
   // Done scavenging. Reset the marker.
   ASSERT(scavenging_);
   scavenging_ = false;
 }
 
 
 void Scavenger::WriteProtect(bool read_only) {
   space_->Protect(
       read_only ? VirtualMemory::kReadOnly : VirtualMemory::kReadWrite);
@@ skipping 13 matching lines @@
   PeerTable::iterator it = peer_table_.find(raw_obj);
   return (it == peer_table_.end()) ? NULL : it->second;
 }
 
 
 int64_t Scavenger::PeerCount() const {
   return static_cast<int64_t>(peer_table_.size());
 }
 
 }  // namespace dart