- Start using the collected store buffer entries to find

vm/heap.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/heap.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/compiler_stats.h"
 #include "vm/flags.h"
@@ skipping 41 matching lines @@
 }
 
 
 uword Heap::AllocateNew(intptr_t size) {
   ASSERT(Isolate::Current()->no_gc_scope_depth() == 0);
   uword addr = new_space_->TryAllocate(size);
   if (addr != 0) {
     return addr;
   }
   CollectGarbage(kNew);
-  if (FLAG_verbose_gc) {
-    PrintSizes();
-  }
   addr = new_space_->TryAllocate(size);
   if (addr != 0) {
     return addr;
   }
   return AllocateOld(size);
 }
 
 
 uword Heap::AllocateOld(intptr_t size) {
   ASSERT(Isolate::Current()->no_gc_scope_depth() == 0);
   uword addr = old_space_->TryAllocate(size);
   if (addr == 0) {
     CollectAllGarbage();
-    if (FLAG_verbose_gc) {
-      PrintSizes();
-    }
     addr = old_space_->TryAllocate(size, PageSpace::kForceGrowth);
     if (addr == 0) {
       OS::PrintErr("Exhausted heap space, trying to allocate %d bytes.\n",
                    size);
     }
   }
   return addr;
 }
 
 
@@ skipping 91 matching lines @@
     case kOld:
       old_space_->MarkSweep(invoke_api_callbacks);
       break;
     case kCode:
       UNIMPLEMENTED();
       code_space_->MarkSweep(invoke_api_callbacks);
       break;
     default:
       UNREACHABLE();
   }
+  if (FLAG_verbose_gc) {
+    PrintSizes();
+  }
 }
 
 
 void Heap::CollectGarbage(Space space) {
   ApiCallbacks api_callbacks;
   if (space == kOld) {
     api_callbacks = kInvokeApiCallbacks;
   } else {
     api_callbacks = kIgnoreApiCallbacks;
   }
   CollectGarbage(space, api_callbacks);
 }
 
 
 void Heap::CollectAllGarbage() {
   new_space_->Scavenge(kInvokeApiCallbacks);
   old_space_->MarkSweep(kInvokeApiCallbacks);
   // TODO(iposva): Merge old and code space.
   // code_space_->MarkSweep(kInvokeApiCallbacks);
+  if (FLAG_verbose_gc) {
+    PrintSizes();
+  }
 }
 
 
 void Heap::EnableGrowthControl() {
   old_space_->EnableGrowthControl();
 }
 
 
 uword Heap::TopAddress() {
   return reinterpret_cast<uword>(new_space_->TopAddress());
@@ skipping 98 matching lines @@
   isolate()->IncrementNoGCScopeDepth();
 }
 
 
 NoGCScope::~NoGCScope() {
   isolate()->DecrementNoGCScopeDepth();
 }
 #endif  // defined(DEBUG)
 
 }  // namespace dart