- 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 53 matching lines @@
     }
   }
   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);
+    {
+      MonitorLocker ml(old_space_->tasks_lock());
+      addr = old_space_->TryAllocate(size, type);
+      while ((addr == 0) && (old_space_->tasks())) {

[koda, 2014/08/26 23:34:48]

Add missing "> 0" (or, per my other comment, "has_tasks()")

[Ivan Posva, 2014/08/27 01:00:22]

Uiuiuiui! That should not have happened.

+        ml.Wait();
+        addr = old_space_->TryAllocate(size, type);
+      }
+    }
     if (addr == 0) {
-      OS::PrintErr("Exhausted heap space, trying to allocate %" Pd " bytes.\n",
-                   size);
-      return 0;
+      CollectAllGarbage();
+      addr = old_space_->TryAllocate(size, type, PageSpace::kForceGrowth);

[koda, 2014/08/26 23:34:48]

Explain why there's no point in waiting for sweepers here.

[Ivan Posva, 2014/08/27 01:00:22]

We should be waiting for sweepers here, but I missed it during refactoring of
this code. Thanks!

+      if (addr == 0) {
+        OS::PrintErr(
+            "Exhausted heap space, trying to allocate %" Pd " bytes.\n", size);
+        return 0;
+      }
     }
   }
   return addr;
 }
 
 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)) {
@@ skipping 501 matching lines @@
     heap->DisableGrowthControl();
 }
 
 
 NoHeapGrowthControlScope::~NoHeapGrowthControlScope() {
     Heap* heap = reinterpret_cast<Isolate*>(isolate())->heap();
     heap->SetGrowthControlState(current_growth_controller_state_);
 }
 
 }  // namespace dart