src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

*** 949,959 ****
  
    // compute expansion delta needed for reaching desired free percentage
    if (free_percentage < desired_free_percentage) {
      size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
      assert(desired_capacity >= capacity(), "invalid expansion size");
!     size_t expand_bytes = MAX2(desired_capacity - capacity(), MinHeapDeltaBytes);
      if (PrintGCDetails && Verbose) {
        size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
        gclog_or_tty->print_cr("\nFrom compute_new_size: ");
        gclog_or_tty->print_cr("  Free fraction %f", free_percentage);
        gclog_or_tty->print_cr("  Desired free fraction %f",
--- 949,959 ----
  
    // compute expansion delta needed for reaching desired free percentage
    if (free_percentage < desired_free_percentage) {
      size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
      assert(desired_capacity >= capacity(), "invalid expansion size");
!     size_t expand_bytes = MAX2(desired_capacity - capacity(), (size_t)MinHeapDeltaBytes);
      if (PrintGCDetails && Verbose) {
        size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
        gclog_or_tty->print_cr("\nFrom compute_new_size: ");
        gclog_or_tty->print_cr("  Free fraction %f", free_percentage);
        gclog_or_tty->print_cr("  Desired free fraction %f",
*** 6554,6564 ****
      CMSPhaseAccounting cmspa(this, "reset", !PrintGCDetails);
  
      HeapWord* curAddr = _markBitMap.startWord();
      while (curAddr < _markBitMap.endWord()) {
        size_t remaining  = pointer_delta(_markBitMap.endWord(), curAddr);
!       MemRegion chunk(curAddr, MIN2(CMSBitMapYieldQuantum, remaining));
        _markBitMap.clear_large_range(chunk);
        if (ConcurrentMarkSweepThread::should_yield() &&
            !foregroundGCIsActive() &&
            CMSYield) {
          assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
--- 6554,6564 ----
      CMSPhaseAccounting cmspa(this, "reset", !PrintGCDetails);
  
      HeapWord* curAddr = _markBitMap.startWord();
      while (curAddr < _markBitMap.endWord()) {
        size_t remaining  = pointer_delta(_markBitMap.endWord(), curAddr);
!       MemRegion chunk(curAddr, MIN2((size_t)CMSBitMapYieldQuantum, remaining));
        _markBitMap.clear_large_range(chunk);
        if (ConcurrentMarkSweepThread::should_yield() &&
            !foregroundGCIsActive() &&
            CMSYield) {
          assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
*** 6853,6863 ****
        gclog_or_tty->print_cr(" (benign) Hit CMSMarkStack max size limit");
      }
      return;
    }
    // Double capacity if possible
!   size_t new_capacity = MIN2(_capacity*2, MarkStackSizeMax);
    // Do not give up existing stack until we have managed to
    // get the double capacity that we desired.
    ReservedSpace rs(ReservedSpace::allocation_align_size_up(
                     new_capacity * sizeof(oop)));
    if (rs.is_reserved()) {
--- 6853,6863 ----
        gclog_or_tty->print_cr(" (benign) Hit CMSMarkStack max size limit");
      }
      return;
    }
    // Double capacity if possible
!   size_t new_capacity = MIN2(_capacity*2, (size_t)MarkStackSizeMax);
    // Do not give up existing stack until we have managed to
    // get the double capacity that we desired.
    ReservedSpace rs(ReservedSpace::allocation_align_size_up(
                     new_capacity * sizeof(oop)));
    if (rs.is_reserved()) {