src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp

rev 6804 : imported patch commit-uncommit-within-heap
rev 6806 : [mq]: bengt-suggestions

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc_implementation/g1/heapRegion.hpp"
  #include "gc_implementation/g1/satbQueue.hpp"
  #include "runtime/atomic.inline.hpp"
  #include "runtime/mutexLocker.hpp"
*** 36,46 ****
      CardTableModRefBSForCTRS(whole_heap, max_covered_regions)
  {
    _kind = G1SATBCT;
  }
  
- 
  void G1SATBCardTableModRefBS::enqueue(oop pre_val) {
    // Nulls should have been already filtered.
    assert(pre_val->is_oop(true), "Error");
  
    if (!JavaThread::satb_mark_queue_set().is_active()) return;
--- 37,46 ----
*** 123,139 ****
  void G1SATBCardTableModRefBS::verify_g1_young_region(MemRegion mr) {
    verify_region(mr, g1_young_gen,  true);
  }
  #endif
  
  G1SATBCardTableLoggingModRefBS::
  G1SATBCardTableLoggingModRefBS(MemRegion whole_heap,
                                 int max_covered_regions) :
    G1SATBCardTableModRefBS(whole_heap, max_covered_regions),
!   _dcqs(JavaThread::dirty_card_queue_set())
  {
    _kind = G1SATBCTLogging;
  }
  
  void
  G1SATBCardTableLoggingModRefBS::write_ref_field_work(void* field,
                                                       oop new_val,
--- 123,178 ----
  void G1SATBCardTableModRefBS::verify_g1_young_region(MemRegion mr) {
    verify_region(mr, g1_young_gen,  true);
  }
  #endif
  
+ void G1SATBCardTableLoggingModRefBSChangedListener::on_commit(uint start_idx, size_t num_regions) {
+   MemRegion mr(G1CollectedHeap::heap()->bottom_addr_for_region(start_idx), num_regions * HeapRegion::GrainWords);
+   _card_table->clear(mr);
+ }
+ 
  G1SATBCardTableLoggingModRefBS::
  G1SATBCardTableLoggingModRefBS(MemRegion whole_heap,
                                 int max_covered_regions) :
    G1SATBCardTableModRefBS(whole_heap, max_covered_regions),
!   _dcqs(JavaThread::dirty_card_queue_set()),
!   _listener()
  {
    _kind = G1SATBCTLogging;
+   _listener.set_card_table(this);
+ }
+ 
+ void G1SATBCardTableLoggingModRefBS::initialize(G1RegionToSpaceMapper* mapper) {
+   mapper->set_mapping_changed_listener(&_listener);
+ 
+   _byte_map_size = mapper->reserved().byte_size();
+ 
+   _guard_index = cards_required(_whole_heap.word_size()) - 1;
+   _last_valid_index = _guard_index - 1;
+ 
+   HeapWord* low_bound  = _whole_heap.start();
+   HeapWord* high_bound = _whole_heap.end();
+ 
+   _cur_covered_regions = 1;
+   _covered[0] = _whole_heap;
+ 
+   _byte_map = (jbyte*) mapper->reserved().start();
+   byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);
+   assert(byte_for(low_bound) == &_byte_map[0], "Checking start of map");
+   assert(byte_for(high_bound-1) <= &_byte_map[_last_valid_index], "Checking end of map");
+ 
+   if (TraceCardTableModRefBS) {
+     gclog_or_tty->print_cr("G1SATBCardTableModRefBS::G1SATBCardTableModRefBS: ");
+     gclog_or_tty->print_cr("  "
+                   "  &_byte_map[0]: " INTPTR_FORMAT
+                   "  &_byte_map[_last_valid_index]: " INTPTR_FORMAT,
+                   p2i(&_byte_map[0]),
+                   p2i(&_byte_map[_last_valid_index]));
+     gclog_or_tty->print_cr("  "
+                   "  byte_map_base: " INTPTR_FORMAT,
+                   p2i(byte_map_base));
+   }
  }
  
  void
  G1SATBCardTableLoggingModRefBS::write_ref_field_work(void* field,
                                                       oop new_val,