@@ -73,10 +73,10 @@ bool ZDirector::rule_warmup() const {
73
73
// Perform GC if heap usage passes 10/20/30% and no other GC has been
74
74
// performed yet. This allows us to get some early samples of the GC
75
75
// duration, which is needed by the other rules.
76
- const size_t max_capacity = ZHeap::heap ()->soft_max_capacity ();
76
+ const size_t soft_max_capacity = ZHeap::heap ()->soft_max_capacity ();
77
77
const size_t used = ZHeap::heap ()->used ();
78
78
const double used_threshold_percent = (ZStatCycle::nwarmup_cycles () + 1 ) * 0.1 ;
79
- const size_t used_threshold = max_capacity * used_threshold_percent;
79
+ const size_t used_threshold = soft_max_capacity * used_threshold_percent;
80
80
81
81
log_debug (gc, director)(" Rule: Warmup %.0f%%, Used: " SIZE_FORMAT " MB, UsedThreshold: " SIZE_FORMAT " MB" ,
82
82
used_threshold_percent * 100 , used / M, used_threshold / M);
@@ -99,10 +99,10 @@ bool ZDirector::rule_allocation_rate() const {
99
99
// Calculate amount of free memory available to Java threads. Note that
100
100
// the heap reserve is not available to Java threads and is therefore not
101
101
// considered part of the free memory.
102
- const size_t max_capacity = ZHeap::heap ()->soft_max_capacity ();
102
+ const size_t soft_max_capacity = ZHeap::heap ()->soft_max_capacity ();
103
103
const size_t max_reserve = ZHeap::heap ()->max_reserve ();
104
104
const size_t used = ZHeap::heap ()->used ();
105
- const size_t free_with_reserve = max_capacity - MIN2 (max_capacity , used);
105
+ const size_t free_with_reserve = soft_max_capacity - MIN2 (soft_max_capacity , used);
106
106
const size_t free = free_with_reserve - MIN2 (free_with_reserve, max_reserve);
107
107
108
108
// Calculate time until OOM given the max allocation rate and the amount
@@ -183,12 +183,12 @@ bool ZDirector::rule_high_usage() const {
183
183
// Calculate amount of free memory available to Java threads. Note that
184
184
// the heap reserve is not available to Java threads and is therefore not
185
185
// considered part of the free memory.
186
- const size_t max_capacity = ZHeap::heap ()->soft_max_capacity ();
186
+ const size_t soft_max_capacity = ZHeap::heap ()->soft_max_capacity ();
187
187
const size_t max_reserve = ZHeap::heap ()->max_reserve ();
188
188
const size_t used = ZHeap::heap ()->used ();
189
- const size_t free_with_reserve = max_capacity - used;
189
+ const size_t free_with_reserve = soft_max_capacity - used;
190
190
const size_t free = free_with_reserve - MIN2 (free_with_reserve, max_reserve);
191
- const double free_percent = percent_of (free, max_capacity );
191
+ const double free_percent = percent_of (free, soft_max_capacity );
192
192
193
193
log_debug (gc, director)(" Rule: High Usage, Free: " SIZE_FORMAT " MB(%.1f%%)" ,
194
194
free / M, free_percent);
0 commit comments