Prepares allocation for proper sync with mutator and bg threads.

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 "vm/dart.h"
 #include "vm/dart_api_state.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
@@ skipping 306 matching lines @@
                      intptr_t max_semi_capacity_in_words,
                      uword object_alignment)
     : heap_(heap),
       max_semi_capacity_in_words_(max_semi_capacity_in_words),
       object_alignment_(object_alignment),
       scavenging_(false),
       delayed_weak_properties_(NULL),
       gc_time_micros_(0),
       collections_(0),
       external_size_(0),
-      failed_to_promote_(false) {
+      failed_to_promote_(false),
+      space_lock_(new Mutex()) {
   // Verify assumptions about the first word in objects which the scavenger is
   // going to use for forwarding pointers.
   ASSERT(Object::tags_offset() == 0);
 
   // Set initial size resulting in a total of three different levels.
   const intptr_t initial_semi_capacity_in_words =
       max_semi_capacity_in_words /
       (FLAG_new_gen_growth_factor * FLAG_new_gen_growth_factor);
 
   const intptr_t kVmNameSize = 128;
@@ skipping 10 matching lines @@
 
   survivor_end_ = FirstObjectStart();
 
   UpdateMaxHeapCapacity();
   UpdateMaxHeapUsage();
 }
 
 Scavenger::~Scavenger() {
   ASSERT(!scavenging_);
   to_->Delete();
+  delete space_lock_;
 }
 
 intptr_t Scavenger::NewSizeInWords(intptr_t old_size_in_words) const {
   if (stats_history_.Size() == 0) {
     return old_size_in_words;
   }
   double garbage = stats_history_.Get(0).GarbageFraction();
   if (garbage < (FLAG_new_gen_garbage_threshold / 100.0)) {
     return Utils::Minimum(max_semi_capacity_in_words_,
                           old_size_in_words * FLAG_new_gen_growth_factor);
@@ skipping 340 matching lines @@
 #endif                                 // defined(DEBUG)
 
       WeakProperty::Clear(cur_weak);
 
       // Advance to next weak property in the queue.
       cur_weak = reinterpret_cast<RawWeakProperty*>(next_weak);
     }
   }
 }
 
-uword Scavenger::FlushTLS() const {
-  ASSERT(heap_ != NULL);
-  uword saved_top = top_;
-  if (heap_->isolate()->IsMutatorThreadScheduled() && !scavenging_) {
-    Thread* mutator_thread = heap_->isolate()->mutator_thread();
-    saved_top = mutator_thread->heap()->new_space()->top();
-    if (mutator_thread->HasActiveTLAB()) {
-      ASSERT(mutator_thread->top() <=
-             mutator_thread->heap()->new_space()->top());
-      mutator_thread->heap()->new_space()->set_top(mutator_thread->top());
+void Scavenger::MakeALLTLABsIterable(Isolate* isolate) const {

[rmacnak, 2017/08/02 20:50:59]

All (lowercase Ls)

+  MonitorLocker ml(isolate->threads_lock(), false);
+  Thread* current = heap_->isolate()->thread_registry()->active_list();
+  while (current != NULL) {
+    if (current->HasActiveTLAB()) {
+      heap_->MakeTLABIterable(current);
     }
+    current = current->next();
   }
-  return saved_top;
 }
 
-void Scavenger::UnflushTLS(uword value) const {
+void Scavenger::FlushTLS() const {
   ASSERT(heap_ != NULL);
-  if (heap_->isolate()->IsMutatorThreadScheduled() && !scavenging_) {
-    Thread* mutator_thread = heap_->isolate()->mutator_thread();
-    mutator_thread->heap()->new_space()->set_top(value);
-    ASSERT(mutator_thread->top() <= mutator_thread->heap()->new_space()->top());
+  if (!scavenging_) {
+    MakeALLTLABsIterable(heap_->isolate());
+  }
+}
+
+void Scavenger::AbandonAllTLABs(Isolate* isolate) {
+  MonitorLocker ml(isolate->threads_lock(), false);
+  Thread* current = isolate->thread_registry()->active_list();
+  while (current != NULL) {
+    heap_->AbandonRemainingTLAB(current);
+    current = current->next();
   }
 }
 
 void Scavenger::VisitObjectPointers(ObjectPointerVisitor* visitor) const {
-  uword saved_top = FlushTLS();
+  FlushTLS();
   uword cur = FirstObjectStart();
   while (cur < top_) {
     RawObject* raw_obj = RawObject::FromAddr(cur);
     cur += raw_obj->VisitPointers(visitor);
   }
-  UnflushTLS(saved_top);
 }
 
 void Scavenger::VisitObjects(ObjectVisitor* visitor) const {
-  uword saved_top = FlushTLS();
+  FlushTLS();
   uword cur = FirstObjectStart();
   while (cur < top_) {
     RawObject* raw_obj = RawObject::FromAddr(cur);
     visitor->VisitObject(raw_obj);
     cur += raw_obj->Size();
   }
-  UnflushTLS(saved_top);
 }
 
 void Scavenger::AddRegionsToObjectSet(ObjectSet* set) const {
   set->AddRegion(to_->start(), to_->end());
 }
 
 RawObject* Scavenger::FindObject(FindObjectVisitor* visitor) const {
   ASSERT(!scavenging_);
-  uword saved_top = FlushTLS();
+  FlushTLS();
   uword cur = FirstObjectStart();
   if (visitor->VisitRange(cur, top_)) {
     while (cur < top_) {
       RawObject* raw_obj = RawObject::FromAddr(cur);
       uword next = cur + raw_obj->Size();
       if (visitor->VisitRange(cur, next) && raw_obj->FindObject(visitor)) {
-        UnflushTLS(saved_top);
         return raw_obj;  // Found object, return it.
       }
       cur = next;
     }
     ASSERT(cur == top_);
   }
-  UnflushTLS(saved_top);
   return Object::null();
 }
 
 void Scavenger::Scavenge() {
   // TODO(cshapiro): Add a decision procedure for determining when the
   // the API callbacks should be invoked.
   Scavenge(false);
 }
 
 void Scavenger::Scavenge(bool invoke_api_callbacks) {
@@ skipping 14 matching lines @@
   scavenging_ = true;
 
   failed_to_promote_ = false;
 
   PageSpace* page_space = heap_->old_space();
   NoSafepointScope no_safepoints;
 
   int64_t post_safe_point = OS::GetCurrentMonotonicMicros();
   heap_->RecordTime(kSafePoint, post_safe_point - pre_safe_point);
 
-  if (isolate->IsMutatorThreadScheduled()) {
-    Thread* mutator_thread = isolate->mutator_thread();
-    if (mutator_thread->HasActiveTLAB()) {
-      heap_->AbandonRemainingTLAB(mutator_thread);
-    }
-  }
+  AbandonAllTLABs(isolate);
 
   // TODO(koda): Make verification more compatible with concurrent sweep.
   if (FLAG_verify_before_gc && !FLAG_concurrent_sweep) {
     OS::PrintErr("Verifying before Scavenge...");
     heap_->Verify(kForbidMarked);
     OS::PrintErr(" done.\n");
   }
 
   // Prepare for a scavenge.
   SpaceUsage usage_before = GetCurrentUsage();
@@ skipping 107 matching lines @@
     }
   }
 
   Scavenge();
 
   // It is possible for objects to stay in the new space
   // if the VM cannot create more pages for these objects.
   ASSERT((UsedInWords() == 0) || failed_to_promote_);
 }
 
+uword Scavenger::FindTopOfSpace(Isolate* isolate) const {
+  MonitorLocker ml(isolate->threads_lock(), false);
+  Thread* current = heap_->isolate()->thread_registry()->active_list();
+  uword furthest_addr = 0;
+  while (current != NULL) {
+    if (current->HasActiveTLAB() && current->top() > furthest_addr) {
+      furthest_addr = current->top();
+    }
+    current = current->next();
+  }
+  if (furthest_addr == 0) {
+    return top_;
+  }
+  return furthest_addr;
+}
+
 int64_t Scavenger::UsedInWords() const {
-  uword saved_top = FlushTLS();
-  int64_t used_in_words = (top_ - FirstObjectStart()) >> kWordSizeLog2;
-  UnflushTLS(saved_top);
+  uword top_of_space = FindTopOfSpace(heap_->isolate());
+  int64_t used_in_words = (top_of_space - FirstObjectStart()) >> kWordSizeLog2;
   return used_in_words;
 }
 
 }  // namespace dart