commit 7469ebf3888b8037421cb6834f37f946646265ec
author Mathieu Chartier <mathieuc@google.com> Mon Sep 24 16:28:36 2012 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Oct 08 18:02:42 2012 -0700
tree b1eb8cd8d1e3b6263c2de77616020de4b4b5019f
parent d8195f19840911a73b1491dfc8e7c18139753731

Refactor and remove copy mark bits.

Refactor code GC realted code to be in a GC folder.

Remove copy mark bits by using pointer changing instead.

Enable concurrent sweeping of system weaks.

Fix non concurrent GC plan.

Change-Id: I9c71478be27d21a75f8a4e6af6faabe896e5e263

src/heap.h

diff --git a/src/heap.h b/src/heap.h
index b4bc22f..1478290 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -21,12 +21,12 @@
 #include <string>
 #include <vector>
 
-#include "atomic_stack.h"
 #include "atomic_integer.h"
-#include "card_table.h"
+#include "gc/atomic_stack.h"
+#include "gc/card_table.h"
+#include "gc/heap_bitmap.h"
 #include "globals.h"
 #include "gtest/gtest.h"
-#include "heap_bitmap.h"
 #include "locks.h"
 #include "offsets.h"
 #include "safe_map.h"
@@ -45,6 +45,7 @@
 class HeapBitmap;
 class ImageSpace;
 class LargeObjectSpace;
+class MarkSweep;
 class ModUnionTable;
 class Mutex;
 class Object;
@@ -282,7 +283,7 @@
       EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_);
 
   // Update and mark mod union table based on gc type.
-  void UpdateAndMarkModUnion(TimingLogger& timings, GcType gc_type)
+  void UpdateAndMarkModUnion(MarkSweep* mark_sweep, TimingLogger& timings, GcType gc_type)
       EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_);
 
   // DEPRECATED: Should remove in "near" future when support for multiple image spaces is added.
@@ -316,7 +317,8 @@
   void RequestConcurrentGC(Thread* self);
 
   // Swap bitmaps (if we are a full Gc then we swap the zygote bitmap too).
-  void SwapBitmaps(Thread* self) EXCLUSIVE_LOCKS_REQUIRED(GlobalSynchronization::heap_bitmap_lock_);
+  void SwapBitmaps(Thread* self, GcType gc_type);
+  void SwapLargeObjects(Thread* self);
 
   void RecordAllocation(size_t size, Object* object)
       LOCKS_EXCLUDED(GlobalSynchronization::heap_bitmap_lock_)
@@ -358,6 +360,9 @@
   // Swap the allocation stack with the live stack.
   void SwapStacks();
 
+  // Clear cards and update the mod union table.
+  void ClearCards(TimingLogger& timings);
+
   Spaces spaces_;
 
   // A map that we use to temporarily reserve address range for the oat file.