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

rev 59215 : imported patch max_gen_size

*** 68,77 ****
--- 68,78 ----
  
  void PSYoungGen::initialize_work() {
  
    _reserved = MemRegion((HeapWord*)virtual_space()->low_boundary(),
                          (HeapWord*)virtual_space()->high_boundary());
+   assert(_reserved.byte_size() == max_gen_size(), "invariant");
  
    MemRegion cmr((HeapWord*)virtual_space()->low(),
                  (HeapWord*)virtual_space()->high());
    ParallelScavengeHeap::heap()->card_table()->resize_covered_region(cmr);
  
*** 272,288 ****
    // 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_size(), "just checking");
  
    // Adjust new generation size
    const size_t eden_plus_survivors =
            align_up(eden_size + 2 * survivor_size, alignment);
!   size_t desired_size = clamp(eden_plus_survivors, min_gen_size(), max_size());
!   assert(desired_size <= max_size(), "just checking");
  
    if (desired_size > orig_size) {
      // Grow the generation
      size_t change = desired_size - orig_size;
      assert(change % alignment == 0, "just checking");
--- 273,289 ----
    // 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");
  
    // Adjust new generation size
    const size_t eden_plus_survivors =
            align_up(eden_size + 2 * survivor_size, alignment);
!   size_t desired_size = clamp(eden_plus_survivors, min_gen_size(), max_gen_size());
!   assert(desired_size <= max_gen_size(), "just checking");
  
    if (desired_size > orig_size) {
      // Grow the generation
      size_t change = desired_size - orig_size;
      assert(change % alignment == 0, "just checking");
*** 310,320 ****
        reset_survivors_after_shrink();
  
        size_changed = true;
      }
    } else {
!     if (orig_size == gen_size_limit()) {
        log_trace(gc)("PSYoung generation size at maximum: " SIZE_FORMAT "K", orig_size/K);
      } else if (orig_size == min_gen_size()) {
        log_trace(gc)("PSYoung generation size at minium: " SIZE_FORMAT "K", orig_size/K);
      }
    }
--- 311,321 ----
        reset_survivors_after_shrink();
  
        size_changed = true;
      }
    } else {
!     if (orig_size == max_gen_size()) {
        log_trace(gc)("PSYoung generation size at maximum: " SIZE_FORMAT "K", orig_size/K);
      } else if (orig_size == min_gen_size()) {
        log_trace(gc)("PSYoung generation size at minium: " SIZE_FORMAT "K", orig_size/K);
      }
    }
*** 324,334 ****
      log_trace(gc)("PSYoung generation size changed: " SIZE_FORMAT "K->" SIZE_FORMAT "K",
                    orig_size/K, virtual_space()->committed_size()/K);
    }
  
    guarantee(eden_plus_survivors <= virtual_space()->committed_size() ||
!             virtual_space()->committed_size() == max_size(), "Sanity");
  
    return true;
  }
  
  #ifndef PRODUCT
--- 325,335 ----
      log_trace(gc)("PSYoung generation size changed: " SIZE_FORMAT "K->" SIZE_FORMAT "K",
                    orig_size/K, virtual_space()->committed_size()/K);
    }
  
    guarantee(eden_plus_survivors <= virtual_space()->committed_size() ||
!             virtual_space()->committed_size() == max_gen_size(), "Sanity");
  
    return true;
  }
  
  #ifndef PRODUCT