< prev index next >

src/hotspot/share/gc/g1/g1BarrierSet.cpp

include problems

G1BarrierSet_merge
  * questions.
  *
  */
 
 #include "precompiled.hpp"
+#include "gc/g1/g1BarrierSet.inline.hpp"
 #include "gc/g1/g1CardTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
-#include "gc/g1/g1SATBCardTableModRefBS.inline.hpp"
 #include "gc/g1/heapRegion.hpp"
 #include "gc/g1/satbMarkQueue.hpp"
 #include "logging/log.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/thread.inline.hpp"
 
-G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(
-  G1CardTable* card_table,
-  const BarrierSet::FakeRtti& fake_rtti) :
-  CardTableModRefBS(card_table, fake_rtti.add_tag(BarrierSet::G1SATBCT))
+G1BarrierSet::G1BarrierSet(G1CardTable* card_table) :
+  CardTableModRefBS(card_table, BarrierSet::FakeRtti(BarrierSet::G1BarrierSet)),
+  _dcqs(JavaThread::dirty_card_queue_set())
 { }
 
-void G1SATBCardTableModRefBS::enqueue(oop pre_val) {
+void G1BarrierSet::enqueue(oop pre_val) {
   // Nulls should have been already filtered.
   assert(oopDesc::is_oop(pre_val, true), "Error");
 
   if (!JavaThread::satb_mark_queue_set().is_active()) return;
   Thread* thr = Thread::current();

@@ -53,39 +52,34 JavaThread::satb_mark_queue_set().shared_satb_queue()->enqueue(pre_val); } } template <class T> void -G1SATBCardTableModRefBS::write_ref_array_pre_work(T* dst, int count) { +G1BarrierSet::write_ref_array_pre_work(T* dst, int count) { if (!JavaThread::satb_mark_queue_set().is_active()) return; T* elem_ptr = dst; for (int i = 0; i < count; i++, elem_ptr++) { T heap_oop = oopDesc::load_heap_oop(elem_ptr); if (!oopDesc::is_null(heap_oop)) { enqueue(oopDesc::decode_heap_oop_not_null(heap_oop)); } } } -void G1SATBCardTableModRefBS::write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) { +void G1BarrierSet::write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) { if (!dest_uninitialized) { write_ref_array_pre_work(dst, count); } } -void G1SATBCardTableModRefBS::write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) { +void G1BarrierSet::write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) { if (!dest_uninitialized) { write_ref_array_pre_work(dst, count); } } -G1SATBCardTableLoggingModRefBS:: -G1SATBCardTableLoggingModRefBS(G1CardTable* card_table) : - G1SATBCardTableModRefBS(card_table, BarrierSet::FakeRtti(G1SATBCTLogging)), - _dcqs(JavaThread::dirty_card_queue_set()) {} - -void G1SATBCardTableLoggingModRefBS::write_ref_field_post_slow(volatile jbyte* byte) { +void G1BarrierSet::write_ref_field_post_slow(volatile jbyte* byte) { // In the slow path, we know a card is not young assert(*byte != G1CardTable::g1_young_card_val(), "slow path invoked without filtering"); OrderAccess::storeload(); if (*byte != G1CardTable::dirty_card_val()) { *byte = G1CardTable::dirty_card_val();
@@ -99,11 +93,11 _dcqs.shared_dirty_card_queue()->enqueue(byte); } } } -void G1SATBCardTableLoggingModRefBS::invalidate(MemRegion mr) { +void G1BarrierSet::invalidate(MemRegion mr) { if (mr.is_empty()) { return; } volatile jbyte* byte = _card_table->byte_for(mr.start()); jbyte* last_byte = _card_table->byte_for(mr.last());
@@ -139,11 +133,11 } } } } -void G1SATBCardTableLoggingModRefBS::on_thread_attach(JavaThread* thread) { +void G1BarrierSet::on_thread_attach(JavaThread* thread) { // This method initializes the SATB and dirty card queues before a // JavaThread is added to the Java thread list. Right now, we don't // have to do anything to the dirty card queue (it should have been // activated when the thread was created), but we have to activate // the SATB queue if the thread is created while a marking cycle is
@@ -169,11 +163,11 if (thread->satb_mark_queue_set().is_active()) { thread->satb_mark_queue().set_active(true); } } -void G1SATBCardTableLoggingModRefBS::on_thread_detach(JavaThread* thread) { +void G1BarrierSet::on_thread_detach(JavaThread* thread) { // Flush any deferred card marks, SATB buffers and dirty card queue buffers CardTableModRefBS::on_thread_detach(thread); thread->satb_mark_queue().flush(); thread->dirty_card_queue().flush(); }
< prev index next >