src/share/vm/memory/generation.cpp

rev 6796 : [mq]: templateOopIterate

*** 43,55 ****
  #include "utilities/copy.hpp"
  #include "utilities/events.hpp"
  
  PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
  
! Generation::Generation(ReservedSpace rs, size_t initial_size, int level) :
    _level(level),
!   _ref_processor(NULL) {
    if (!_virtual_space.initialize(rs, initial_size)) {
      vm_exit_during_initialization("Could not reserve enough space for "
                      "object heap");
    }
    // Mangle all of the the initial generation.
--- 43,56 ----
  #include "utilities/copy.hpp"
  #include "utilities/events.hpp"
  
  PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
  
! Generation::Generation(ReservedSpace rs, size_t initial_size, int level, jbyte dispatch_index) :
    _level(level),
!   _ref_processor(NULL),
!   _dispatch_index(dispatch_index) {
    if (!_virtual_space.initialize(rs, initial_size)) {
      vm_exit_during_initialization("Could not reserve enough space for "
                      "object heap");
    }
    // Mangle all of the the initial generation.
*** 376,387 ****
    }
  }
  
  CardGeneration::CardGeneration(ReservedSpace rs, size_t initial_byte_size,
                                 int level,
!                                GenRemSet* remset) :
!   Generation(rs, initial_byte_size, level), _rs(remset),
    _shrink_factor(0), _min_heap_delta_bytes(), _capacity_at_prologue(),
    _used_at_prologue()
  {
    HeapWord* start = (HeapWord*)rs.base();
    size_t reserved_byte_size = rs.size();
--- 377,389 ----
    }
  }
  
  CardGeneration::CardGeneration(ReservedSpace rs, size_t initial_byte_size,
                                 int level,
!                                GenRemSet* remset,
!                                jbyte dispatch_index) :
!   Generation(rs, initial_byte_size, level, dispatch_index), _rs(remset),
    _shrink_factor(0), _min_heap_delta_bytes(), _capacity_at_prologue(),
    _used_at_prologue()
  {
    HeapWord* start = (HeapWord*)rs.base();
    size_t reserved_byte_size = rs.size();
*** 824,848 ****
  
  bool OneContigSpaceCardGeneration::no_allocs_since_save_marks() {
    return _the_space->saved_mark_at_top();
  }
  
- #define OneContig_SINCE_SAVE_MARKS_ITERATE_DEFN(OopClosureType, nv_suffix)      \
-                                                                                 \
- void OneContigSpaceCardGeneration::                                             \
- oop_since_save_marks_iterate##nv_suffix(OopClosureType* blk) {                  \
-   blk->set_generation(this);                                                    \
-   _the_space->oop_since_save_marks_iterate##nv_suffix(blk);                     \
-   blk->reset_generation();                                                      \
-   save_marks();                                                                 \
- }
- 
- ALL_SINCE_SAVE_MARKS_CLOSURES(OneContig_SINCE_SAVE_MARKS_ITERATE_DEFN)
- 
- #undef OneContig_SINCE_SAVE_MARKS_ITERATE_DEFN
- 
- 
  void OneContigSpaceCardGeneration::gc_epilogue(bool full) {
    _last_gc = WaterMark(the_space(), the_space()->top());
  
    // update the generation and space performance counters
    update_counters();
--- 826,835 ----