commit d5307ec41c8344be0c32273ec4f574064036187d
author Hiroshi Yamauchi <yamauchi@google.com> Thu Mar 27 21:07:51 2014 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Mar 27 21:07:51 2014 -0700
tree 9c80a692e2b142b3149b6efb660065fc73170a58
parent 0fd52d5d0cf01e5a109851098a43a79f5615dc0f

An empty collector skeleton for a read barrier-based collector.

Bug: 12687968

Change-Id: Ic2a3a7b9943ca64e7f60f4d6ed552a316ea4a6f3

runtime/gc/heap.cc

diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 02e7e3f..26bc76d 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -35,6 +35,7 @@
 #include "gc/accounting/mod_union_table-inl.h"
 #include "gc/accounting/remembered_set.h"
 #include "gc/accounting/space_bitmap-inl.h"
+#include "gc/collector/concurrent_copying.h"
 #include "gc/collector/mark_sweep-inl.h"
 #include "gc/collector/partial_mark_sweep.h"
 #include "gc/collector/semi_space.h"
@@ -328,6 +329,9 @@
     bool generational = post_zygote_collector_type_ == kCollectorTypeGSS;
     semi_space_collector_ = new collector::SemiSpace(this, generational);
     garbage_collectors_.push_back(semi_space_collector_);
+
+    concurrent_copying_collector_ = new collector::ConcurrentCopying(this);
+    garbage_collectors_.push_back(concurrent_copying_collector_);
   }
 
   if (running_on_valgrind_) {
@@ -1430,7 +1434,8 @@
       break;
     }
     default: {
-      LOG(FATAL) << "Attempted to transition to invalid collector type";
+      LOG(FATAL) << "Attempted to transition to invalid collector type "
+                 << static_cast<size_t>(collector_type);
       break;
     }
   }
@@ -1460,6 +1465,7 @@
     collector_type_ = collector_type;
     gc_plan_.clear();
     switch (collector_type_) {
+      case kCollectorTypeCC:  // Fall-through.
       case kCollectorTypeSS:  // Fall-through.
       case kCollectorTypeGSS: {
         gc_plan_.push_back(collector::kGcTypeFull);
@@ -1812,12 +1818,19 @@
   if (compacting_gc) {
     DCHECK(current_allocator_ == kAllocatorTypeBumpPointer ||
            current_allocator_ == kAllocatorTypeTLAB);
-    gc_type = semi_space_collector_->GetGcType();
-    CHECK(temp_space_->IsEmpty());
-    semi_space_collector_->SetFromSpace(bump_pointer_space_);
-    semi_space_collector_->SetToSpace(temp_space_);
+    if (collector_type_ == kCollectorTypeSS || collector_type_ == kCollectorTypeGSS) {
+      gc_type = semi_space_collector_->GetGcType();
+      semi_space_collector_->SetFromSpace(bump_pointer_space_);
+      semi_space_collector_->SetToSpace(temp_space_);
+      collector = semi_space_collector_;
+    } else if (collector_type_ == kCollectorTypeCC) {
+      gc_type = concurrent_copying_collector_->GetGcType();
+      collector = concurrent_copying_collector_;
+    } else {
+      LOG(FATAL) << "Unreachable - invalid collector type " << static_cast<size_t>(collector_type_);
+    }
     temp_space_->GetMemMap()->Protect(PROT_READ | PROT_WRITE);
-    collector = semi_space_collector_;
+    CHECK(temp_space_->IsEmpty());
     gc_type = collector::kGcTypeFull;
   } else if (current_allocator_ == kAllocatorTypeRosAlloc ||
       current_allocator_ == kAllocatorTypeDlMalloc) {