src/share/vm/memory/tenuredGeneration.cpp

rev 7215 : imported patch remove_levels

*** 34,47 ****
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
  #include "utilities/macros.hpp"
  
  TenuredGeneration::TenuredGeneration(ReservedSpace rs,
!                                      size_t initial_byte_size, int level,
                                       GenRemSet* remset) :
!   OneContigSpaceCardGeneration(rs, initial_byte_size,
!                                level, remset, NULL)
  {
    HeapWord* bottom = (HeapWord*) _virtual_space.low();
    HeapWord* end    = (HeapWord*) _virtual_space.high();
    _the_space  = new TenuredSpace(_bts, MemRegion(bottom, end));
    _the_space->reset_saved_mark();
--- 34,46 ----
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
  #include "utilities/macros.hpp"
  
  TenuredGeneration::TenuredGeneration(ReservedSpace rs,
!                                      size_t initial_byte_size,
                                       GenRemSet* remset) :
!   OneContigSpaceCardGeneration(rs, initial_byte_size, remset, NULL)
  {
    HeapWord* bottom = (HeapWord*) _virtual_space.low();
    HeapWord* end    = (HeapWord*) _virtual_space.high();
    _the_space  = new TenuredSpace(_bts, MemRegion(bottom, end));
    _the_space->reset_saved_mark();
*** 169,183 ****
  
    assert(used() == used_after_gc && used_after_gc <= capacity(),
           err_msg("used: " SIZE_FORMAT " used_after_gc: " SIZE_FORMAT
           " capacity: " SIZE_FORMAT, used(), used_after_gc, capacity()));
  }
! void TenuredGeneration::update_gc_stats(int current_level,
                                          bool full) {
!   // If the next lower level(s) has been collected, gather any statistics
    // that are of interest at this point.
!   if (!full && (current_level + 1) == level()) {
      // Calculate size of data promoted from the younger generations
      // before doing the collection.
      size_t used_before_gc = used();
  
      // If the younger gen collections were skipped, then the
--- 168,184 ----
  
    assert(used() == used_after_gc && used_after_gc <= capacity(),
           err_msg("used: " SIZE_FORMAT " used_after_gc: " SIZE_FORMAT
           " capacity: " SIZE_FORMAT, used(), used_after_gc, capacity()));
  }
! 
! void TenuredGeneration::update_gc_stats(Generation* current_generation,
                                          bool full) {
!   // If the young generation has been collected, gather any statistics
    // that are of interest at this point.
!   bool current_is_young = (current_generation == GenCollectedHeap::heap()->young_gen());
!   if (!full && current_is_young) {
      // Calculate size of data promoted from the younger generations
      // before doing the collection.
      size_t used_before_gc = used();
  
      // If the younger gen collections were skipped, then the