Calculation fix for soft_max_capacity

Author: jsikstro

src/hotspot/share/gc/z/zPageAllocator.cpp

@@ -629,12 +629,11 @@ ZPageAllocatorStats ZPageAllocator::stats(ZGeneration* generation) const {
                           state->_used_generations[gen_id]);
   }
 
-  // We can only calculate the soft_max_capcity after finding the combined value
-  // for the current_max_capacity, so we set it after constructing the stats object.
+  // We can only calculate the soft_max_capacity after finding the combined value
+  // for current_max_capacity, so we set it after incrementing all the other stats.
   const size_t soft_max_heapsize = Atomic::load(&SoftMaxHeapSize);
-  if (current_max_capacity > soft_max_heapsize) {
-    stats.set_soft_max_capacity(current_max_capacity);
-  }
+  const size_t soft_max_capacity = MIN2(soft_max_heapsize, current_max_capacity);
+  stats.set_soft_max_capacity(soft_max_capacity);
 
   return stats;
 }

src/hotspot/share/gc/z/zPageAllocator.hpp

@@ -193,7 +193,7 @@ class ZPageAllocatorStats {
   size_t used_low() const;
   size_t used_generation() const;
 
-  void set_soft_max_capacity(size_t new_capacity);
+  void set_soft_max_capacity(size_t soft_max_capacity);
 };
 
 #endif // SHARE_GC_Z_ZPAGEALLOCATOR_HPP

src/hotspot/share/gc/z/zPageAllocator.inline.hpp

@@ -106,8 +106,8 @@ inline size_t ZPageAllocatorStats::allocation_stalls() const {
   return _allocation_stalls;
 }
 
-inline void ZPageAllocatorStats::set_soft_max_capacity(size_t new_capacity) {
-  _soft_max_capacity = new_capacity;
+inline void ZPageAllocatorStats::set_soft_max_capacity(size_t soft_max_capacity) {
+  _soft_max_capacity = soft_max_capacity;
 }
 
 #endif // SHARE_GC_Z_ZPAGEALLOCATOR_INLINE_HPP