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

rev 59215 : imported patch max_gen_size

*** 590,608 ****
            counters->update_survived(survived);
            counters->update_promoted(promoted);
            counters->update_survivor_overflowed(_survivor_overflow);
          }
  
!         size_t max_young_size = young_gen->max_size();
  
          // Deciding a free ratio in the young generation is tricky, so if
          // MinHeapFreeRatio or MaxHeapFreeRatio are in use (implicating
          // that the old generation size may have been limited because of them) we
          // should then limit our young generation size using NewRatio to have it
          // follow the old generation size.
          if (MinHeapFreeRatio != 0 || MaxHeapFreeRatio != 100) {
!           max_young_size = MIN2(old_gen->capacity_in_bytes() / NewRatio, young_gen->max_size());
          }
  
          size_t survivor_limit =
            size_policy->max_survivor_size(max_young_size);
          _tenuring_threshold =
--- 590,609 ----
            counters->update_survived(survived);
            counters->update_promoted(promoted);
            counters->update_survivor_overflowed(_survivor_overflow);
          }
  
!         size_t max_young_size = young_gen->max_gen_size();
  
          // Deciding a free ratio in the young generation is tricky, so if
          // MinHeapFreeRatio or MaxHeapFreeRatio are in use (implicating
          // that the old generation size may have been limited because of them) we
          // should then limit our young generation size using NewRatio to have it
          // follow the old generation size.
          if (MinHeapFreeRatio != 0 || MaxHeapFreeRatio != 100) {
!           max_young_size = MIN2(old_gen->capacity_in_bytes() / NewRatio,
!                                 young_gen->max_gen_size());
          }
  
          size_t survivor_limit =
            size_policy->max_survivor_size(max_young_size);
          _tenuring_threshold =
*** 623,635 ****
  
          // Do call at minor collections?
          // Don't check if the size_policy is ready at this
          // level.  Let the size_policy check that internally.
          if (UseAdaptiveGenerationSizePolicyAtMinorCollection &&
!             (AdaptiveSizePolicy::should_update_eden_stats(gc_cause))) {
            // Calculate optimal free space amounts
!           assert(young_gen->max_size() >
              young_gen->from_space()->capacity_in_bytes() +
              young_gen->to_space()->capacity_in_bytes(),
              "Sizes of space in young gen are out-of-bounds");
  
            size_t young_live = young_gen->used_in_bytes();
--- 624,636 ----
  
          // Do call at minor collections?
          // Don't check if the size_policy is ready at this
          // level.  Let the size_policy check that internally.
          if (UseAdaptiveGenerationSizePolicyAtMinorCollection &&
!             AdaptiveSizePolicy::should_update_eden_stats(gc_cause)) {
            // Calculate optimal free space amounts
!           assert(young_gen->max_gen_size() >
                   young_gen->from_space()->capacity_in_bytes() +
                   young_gen->to_space()->capacity_in_bytes(),
                   "Sizes of space in young gen are out-of-bounds");
  
            size_t young_live = young_gen->used_in_bytes();