src/share/vm/gc/g1/g1RemSet.hpp

rev 12906 : [mq]: gc_interface

@@ -24,10 +24,11 @@
 
 #ifndef SHARE_VM_GC_G1_G1REMSET_HPP
 #define SHARE_VM_GC_G1_G1REMSET_HPP
 
 #include "gc/g1/dirtyCardQueue.hpp"
+#include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1CardLiveData.hpp"
 #include "gc/g1/g1RemSetSummary.hpp"
 #include "gc/g1/heapRegion.hpp"
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"

@@ -42,11 +43,10 @@
 class G1CollectedHeap;
 class G1HotCardCache;
 class G1ParPushHeapRSClosure;
 class G1RemSetScanState;
 class G1Policy;
-class G1SATBCardTableModRefBS;
 class HeapRegionClaimer;
 
 // A G1RemSet in which each heap region has a rem set that records the
 // external heap references into it.  Uses a mod ref bs to track updates,
 // so that they can be used to update the individual region remsets.

@@ -67,11 +67,11 @@
   G1CollectedHeap* _g1;
   size_t _conc_refine_cards;
   uint n_workers();
 
 protected:
-  CardTableModRefBS*     _ct_bs;
+  G1CardTable*           _ct;
   G1Policy*              _g1p;
   G1HotCardCache*        _hot_card_cache;
 
 public:
   // Gives an approximation on how many threads can be expected to add records to

@@ -88,11 +88,11 @@
   // is finished and the initial hash table is no longer being
   // scanned.
   void cleanupHRRS();
 
   G1RemSet(G1CollectedHeap* g1,
-           CardTableModRefBS* ct_bs,
+           G1CardTable* ct,
            G1HotCardCache* hot_card_cache);
   ~G1RemSet();
 
   // Invoke "cl->do_oop" on all pointers into the collection set
   // from objects in regions outside the collection set (having

@@ -189,11 +189,11 @@
 
   G1ParPushHeapRSClosure* _push_heap_cl;
   CodeBlobClosure* _code_root_cl;
 
   G1BlockOffsetTable* _bot;
-  G1SATBCardTableModRefBS *_ct_bs;
+  G1CardTable *_ct;
 
   double _strong_code_root_scan_time_sec;
   uint   _worker_i;
   size_t _block_size;