src/hotspot/share/gc/parallel/psYoungGen.cpp

rev 59216 : [mq]: cleanup
rev 59217 : [mq]: remove_init_gen_size

*** 39,70 ****
    _reserved(),
    _virtual_space(NULL),
    _eden_space(NULL),
    _from_space(NULL),
    _to_space(NULL),
-   _init_gen_size(initial_size),
    _min_gen_size(min_size),
    _max_gen_size(max_size),
    _gen_counters(NULL),
    _eden_counters(NULL),
    _from_counters(NULL),
    _to_counters(NULL)
  {
!   initialize(rs, GenAlignment);
  }
  
! void PSYoungGen::initialize_virtual_space(ReservedSpace rs, size_t alignment) {
!   assert(_init_gen_size != 0, "Should have a finite size");
    _virtual_space = new PSVirtualSpace(rs, alignment);
!   if (!virtual_space()->expand_by(_init_gen_size)) {
!     vm_exit_during_initialization("Could not reserve enough space for "
!                                   "object heap");
    }
  }
  
! void PSYoungGen::initialize(ReservedSpace rs, size_t alignment) {
!   initialize_virtual_space(rs, alignment);
    initialize_work();
  }
  
  void PSYoungGen::initialize_work() {
  
--- 39,70 ----
    _reserved(),
    _virtual_space(NULL),
    _eden_space(NULL),
    _from_space(NULL),
    _to_space(NULL),
    _min_gen_size(min_size),
    _max_gen_size(max_size),
    _gen_counters(NULL),
    _eden_counters(NULL),
    _from_counters(NULL),
    _to_counters(NULL)
  {
!   initialize(rs, initial_size, GenAlignment);
  }
  
! void PSYoungGen::initialize_virtual_space(ReservedSpace rs,
!                                           size_t initial_size,
!                                           size_t alignment) {
!   assert(initial_size != 0, "Should have a finite size");
    _virtual_space = new PSVirtualSpace(rs, alignment);
!   if (!virtual_space()->expand_by(initial_size)) {
!     vm_exit_during_initialization("Could not reserve enough space for object heap");
    }
  }
  
! void PSYoungGen::initialize(ReservedSpace rs, size_t initial_size, size_t alignment) {
!   initialize_virtual_space(rs, initial_size, alignment);
    initialize_work();
  }
  
  void PSYoungGen::initialize_work() {
  
*** 90,101 ****
    }
    _from_space = new MutableSpace(virtual_space()->alignment());
    _to_space   = new MutableSpace(virtual_space()->alignment());
  
    // Generation Counters - generation 0, 3 subspaces
!   _gen_counters = new PSGenerationCounters("new", 0, 3, _min_gen_size,
!                                            _max_gen_size, _virtual_space);
  
    // Compute maximum space sizes for performance counters
    size_t alignment = SpaceAlignment;
    size_t size = virtual_space()->reserved_size();
  
--- 90,101 ----
    }
    _from_space = new MutableSpace(virtual_space()->alignment());
    _to_space   = new MutableSpace(virtual_space()->alignment());
  
    // Generation Counters - generation 0, 3 subspaces
!   _gen_counters = new PSGenerationCounters("new", 0, 3, min_gen_size(),
!                                            max_gen_size(), virtual_space());
  
    // Compute maximum space sizes for performance counters
    size_t alignment = SpaceAlignment;
    size_t size = virtual_space()->reserved_size();
  
*** 257,278 ****
      log_trace(gc, ergo)("Young generation size: "
                          "desired eden: " SIZE_FORMAT " survivor: " SIZE_FORMAT
                          " used: " SIZE_FORMAT " capacity: " SIZE_FORMAT
                          " gen limits: " SIZE_FORMAT " / " SIZE_FORMAT,
                          eden_size, survivor_size, used_in_bytes(), capacity_in_bytes(),
!                         _max_gen_size, min_gen_size());
    }
  }
  
  
  bool PSYoungGen::resize_generation(size_t eden_size, size_t survivor_size) {
    const size_t alignment = virtual_space()->alignment();
    size_t orig_size = virtual_space()->committed_size();
    bool size_changed = false;
  
    // There used to be this guarantee there.
!   // guarantee ((eden_size + 2*survivor_size)  <= _max_gen_size, "incorrect input arguments");
    // Code below forces this requirement.  In addition the desired eden
    // size and desired survivor sizes are desired goals and may
    // exceed the total generation size.
  
    assert(min_gen_size() <= orig_size && orig_size <= max_gen_size(), "just checking");
--- 257,278 ----
      log_trace(gc, ergo)("Young generation size: "
                          "desired eden: " SIZE_FORMAT " survivor: " SIZE_FORMAT
                          " used: " SIZE_FORMAT " capacity: " SIZE_FORMAT
                          " gen limits: " SIZE_FORMAT " / " SIZE_FORMAT,
                          eden_size, survivor_size, used_in_bytes(), capacity_in_bytes(),
!                         max_gen_size(), min_gen_size());
    }
  }
  
  
  bool PSYoungGen::resize_generation(size_t eden_size, size_t survivor_size) {
    const size_t alignment = virtual_space()->alignment();
    size_t orig_size = virtual_space()->committed_size();
    bool size_changed = false;
  
    // There used to be this guarantee there.
!   // guarantee ((eden_size + 2*survivor_size)  <= max_gen_size(), "incorrect input arguments");
    // Code below forces this requirement.  In addition the desired eden
    // size and desired survivor sizes are desired goals and may
    // exceed the total generation size.
  
    assert(min_gen_size() <= orig_size && orig_size <= max_gen_size(), "just checking");