- Add and enable concurrent sweeper.

runtime/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/flags.h"
 #include "vm/isolate.h"
+#include "vm/lockers.h"
 #include "vm/object.h"
 #include "vm/object_set.h"
 #include "vm/os.h"
 #include "vm/pages.h"
 #include "vm/raw_object.h"
 #include "vm/scavenger.h"
 #include "vm/service.h"
 #include "vm/stack_frame.h"
 #include "vm/tags.h"
 #include "vm/verifier.h"
@@ skipping 52 matching lines @@
       return AllocateOld(size, HeapPage::kData);
     }
   }
   return addr;
 }
 
 
 uword Heap::AllocateOld(intptr_t size, HeapPage::PageType type) {
   ASSERT(isolate()->no_gc_scope_depth() == 0);
   uword addr = old_space_->TryAllocate(size, type);
-  if (addr == 0) {
-    CollectAllGarbage();
-    addr = old_space_->TryAllocate(size, type, PageSpace::kForceGrowth);
-    if (addr == 0) {
-      OS::PrintErr("Exhausted heap space, trying to allocate %" Pd " bytes.\n",
-                   size);
-      return 0;
+  if (addr != 0) {
+    return addr;
+  }
+  // If we are in the process of running a sweep wait for the sweeper to free
+  // memory.
+  {
+    MonitorLocker ml(old_space_->tasks_lock());
+    addr = old_space_->TryAllocate(size, type);
+    while ((addr == 0) && (old_space_->tasks())) {
+      ml.Wait();
+      addr = old_space_->TryAllocate(size, type);
     }
   }
-  return addr;
+  if (addr != 0) {
+    return addr;
+  }
+  // All GC tasks finished without allocating successfully. Run a full GC.
+  CollectAllGarbage();
+  addr = old_space_->TryAllocate(size, type, PageSpace::kForceGrowth);
+  if (addr != 0) {
+    return addr;
+  }
+  // Wait for all of the concurrent tasks to finish before giving up.
+  {
+    MonitorLocker ml(old_space_->tasks_lock());
+    addr = old_space_->TryAllocate(size, type);
+    while ((addr == 0) && (old_space_->tasks())) {
+      ml.Wait();
+      addr = old_space_->TryAllocate(size, type);

[koda, 2014/08/27 05:42:20]

Shouldn't this have kForceGrowth?

+    }
+  }
+  if (addr != 0) {
+    return addr;
+  }
+  // Giving up allocating this object.
+  OS::PrintErr(
+      "Exhausted heap space, trying to allocate %" Pd " bytes.\n", size);
+  return 0;
 }
 
 void Heap::AllocateExternal(intptr_t size, Space space) {
   ASSERT(isolate()->no_gc_scope_depth() == 0);
   if (space == kNew) {
     new_space_->AllocateExternal(size);
     if (new_space_->ExternalInWords() > (FLAG_new_gen_ext_limit * MBInWords)) {
       // Attempt to free some external allocation by a scavenge. (If the total
       // remains above the limit, next external alloc will trigger another.)
       CollectGarbage(kNew);
@@ skipping 498 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart