src/share/vm/memory/cardGeneration.cpp

rev 7474 : imported patch separateCardGeneration
rev 7477 : imported patch move_stuff_up

*** 21,31 ****
--- 21,33 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ 
  #include "memory/blockOffsetTable.inline.hpp"
+ #include "memory/cardGeneration.inline.hpp"
  #include "memory/gcLocker.hpp"
  #include "memory/generationSpec.hpp"
  #include "memory/genOopClosures.inline.hpp"
  #include "memory/genRemSet.hpp"
  #include "memory/iterator.hpp"
*** 65,74 ****
--- 67,113 ----
    _min_heap_delta_bytes = MinHeapDeltaBytes;
    _capacity_at_prologue = initial_byte_size;
    _used_at_prologue = 0;
  }
  
+ bool CardGeneration::grow_by(size_t bytes) {
+   assert_correct_size_change_locking();
+   bool result = _virtual_space.expand_by(bytes);
+   if (result) {
+     size_t new_word_size =
+        heap_word_size(_virtual_space.committed_size());
+     MemRegion mr(space()->bottom(), new_word_size);
+     // Expand card table
+     Universe::heap()->barrier_set()->resize_covered_region(mr);
+     // Expand shared block offset array
+     _bts->resize(new_word_size);
+ 
+     // Fix for bug #4668531
+     if (ZapUnusedHeapArea) {
+       MemRegion mangle_region(space()->end(),
+       (HeapWord*)_virtual_space.high());
+       SpaceMangler::mangle_region(mangle_region);
+     }
+ 
+     // Expand space -- also expands space's BOT
+     // (which uses (part of) shared array above)
+     space()->set_end((HeapWord*)_virtual_space.high());
+ 
+     // update the space and generation capacity counters
+     update_counters();
+ 
+     if (Verbose && PrintGC) {
+       size_t new_mem_size = _virtual_space.committed_size();
+       size_t old_mem_size = new_mem_size - bytes;
+       gclog_or_tty->print_cr("Expanding %s from " SIZE_FORMAT "K by "
+                       SIZE_FORMAT "K to " SIZE_FORMAT "K",
+                       name(), old_mem_size/K, bytes/K, new_mem_size/K);
+     }
+   }
+   return result;
+ }
+ 
  bool CardGeneration::expand(size_t bytes, size_t expand_bytes) {
    assert_locked_or_safepoint(Heap_lock);
    if (bytes == 0) {
      return true;  // That's what grow_by(0) would return
    }
*** 100,120 ****
--- 139,199 ----
    }
  
    return success;
  }
  
+ bool CardGeneration::grow_to_reserved() {
+   assert_correct_size_change_locking();
+   bool success = true;
+   const size_t remaining_bytes = _virtual_space.uncommitted_size();
+   if (remaining_bytes > 0) {
+     success = grow_by(remaining_bytes);
+     DEBUG_ONLY(if (!success) warning("grow to reserved failed");)
+   }
+   return success;
+ }
+ 
+ void CardGeneration::shrink(size_t bytes) {
+   assert_correct_size_change_locking();
+ 
+   size_t size = ReservedSpace::page_align_size_down(bytes);
+   if (size == 0) {
+     return;
+   }
+ 
+   // Shrink committed space
+   _virtual_space.shrink_by(size);
+   // Shrink space; this also shrinks the space's BOT
+   space()->set_end((HeapWord*) _virtual_space.high());
+   size_t new_word_size = heap_word_size(space()->capacity());
+   // Shrink the shared block offset array
+   _bts->resize(new_word_size);
+   MemRegion mr(space()->bottom(), new_word_size);
+   // Shrink the card table
+   Universe::heap()->barrier_set()->resize_covered_region(mr);
+ 
+   if (Verbose && PrintGC) {
+     size_t new_mem_size = _virtual_space.committed_size();
+     size_t old_mem_size = new_mem_size + size;
+     gclog_or_tty->print_cr("Shrinking %s from " SIZE_FORMAT "K to " SIZE_FORMAT "K",
+                   name(), old_mem_size/K, new_mem_size/K);
+   }
+ }
+ 
  // No young generation references, clear this generation's cards.
  void CardGeneration::clear_remembered_set() {
    _rs->clear(reserved());
  }
  
+ 
  // Objects in this generation may have moved, invalidate this
  // generation's cards.
  void CardGeneration::invalidate_remembered_set() {
    _rs->invalidate(used_region());
  }
  
+ 
  void CardGeneration::compute_new_size() {
    assert(_shrink_factor <= 100, "invalid shrink factor");
    size_t current_shrink_factor = _shrink_factor;
    _shrink_factor = 0;
  
*** 267,271 ****
--- 346,361 ----
    }
  }
  
  // Currently nothing to do.
  void CardGeneration::prepare_for_verify() {}
+ 
+ void CardGeneration::space_iterate(SpaceClosure* blk,
+                                                  bool usedOnly) {
+   blk->do_space(space());
+ }
+ 
+ void CardGeneration::younger_refs_iterate(OopsInGenClosure* blk) {
+   blk->set_generation(this);
+   younger_refs_in_space_iterate(space(), blk);
+   blk->reset_generation();
+ }