--- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2013-02-22 16:13:44.000000000 -0800 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2013-02-22 16:13:43.000000000 -0800 @@ -969,7 +969,7 @@ } -void CMSAdaptiveSizePolicy::compute_young_generation_free_space(size_t cur_eden, +void CMSAdaptiveSizePolicy::compute_eden_space_size(size_t cur_eden, size_t max_eden_size) { size_t desired_eden_size = cur_eden; @@ -978,7 +978,7 @@ // Printout input if (PrintGC && PrintAdaptiveSizePolicy) { gclog_or_tty->print_cr( - "CMSAdaptiveSizePolicy::compute_young_generation_free_space: " + "CMSAdaptiveSizePolicy::compute_eden_space_size: " "cur_eden " SIZE_FORMAT, cur_eden); } @@ -1024,7 +1024,7 @@ if (PrintGC && PrintAdaptiveSizePolicy) { gclog_or_tty->print_cr( - "CMSAdaptiveSizePolicy::compute_young_generation_free_space limits:" + "CMSAdaptiveSizePolicy::compute_eden_space_size limits:" " desired_eden_size: " SIZE_FORMAT " old_eden_size: " SIZE_FORMAT, desired_eden_size, cur_eden); --- old/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp 2013-02-22 16:13:44.000000000 -0800 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp 2013-02-22 16:13:44.000000000 -0800 @@ -436,7 +436,7 @@ size_t generation_alignment() { return _generation_alignment; } - virtual void compute_young_generation_free_space(size_t cur_eden, + virtual void compute_eden_space_size(size_t cur_eden, size_t max_eden_size); // Calculates new survivor space size; returns a new tenuring threshold // value. Stores new survivor size in _survivor_size. --- old/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp 2013-02-22 16:13:45.000000000 -0800 +++ new/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp 2013-02-22 16:13:45.000000000 -0800 @@ -585,7 +585,7 @@ size_policy->avg_young_live()->sample(used()); size_policy->avg_eden_live()->sample(eden()->used()); - size_policy->compute_young_generation_free_space(eden()->capacity(), + size_policy->compute_eden_space_size(eden()->capacity(), max_gen_size()); resize(size_policy->calculated_eden_size_in_bytes(), --- old/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2013-02-22 16:13:45.000000000 -0800 +++ new/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2013-02-22 16:13:45.000000000 -0800 @@ -194,7 +194,7 @@ // If this is not a full GC, only test and modify the young generation. -void PSAdaptiveSizePolicy::compute_generation_free_space( +void PSAdaptiveSizePolicy::compute_generations_free_space( size_t young_live, size_t eden_live, size_t old_live, @@ -345,7 +345,7 @@ // "free_in_old_gen" was the original value for used for promo_limit size_t free_in_old_gen = (size_t)(max_old_gen_size - avg_old_live()->average()); gclog_or_tty->print_cr( - "PSAdaptiveSizePolicy::compute_generation_free_space limits:" + "PSAdaptiveSizePolicy::compute_generations_free_space limits:" " desired_promo_size: " SIZE_FORMAT " promo_limit: " SIZE_FORMAT " free_in_old_gen: " SIZE_FORMAT @@ -356,7 +356,7 @@ } if (desired_eden_size > eden_limit) { gclog_or_tty->print_cr( - "AdaptiveSizePolicy::compute_generation_free_space limits:" + "AdaptiveSizePolicy::compute_generations_free_space limits:" " desired_eden_size: " SIZE_FORMAT " old_eden_size: " SIZE_FORMAT " eden_limit: " SIZE_FORMAT @@ -368,7 +368,7 @@ } if (gc_cost() > gc_cost_limit) { gclog_or_tty->print_cr( - "AdaptiveSizePolicy::compute_generation_free_space: gc time limit" + "AdaptiveSizePolicy::compute_generations_free_space: gc time limit" " gc_cost: %f " " GCTimeLimit: %d", gc_cost(), GCTimeLimit); @@ -416,7 +416,7 @@ if (PrintAdaptiveSizePolicy) { // Timing stats gclog_or_tty->print( - "PSAdaptiveSizePolicy::compute_generation_free_space: costs" + "PSAdaptiveSizePolicy::compute_generations_free_space: costs" " minor_time: %f" " major_cost: %f" " mutator_cost: %f" @@ -607,7 +607,7 @@ if (PrintAdaptiveSizePolicy && Verbose) { gclog_or_tty->print_cr( - "AdaptiveSizePolicy::compute_generation_free_space " + "AdaptiveSizePolicy::compute_generations_free_space " "adjusting gen sizes for major pause (avg %f goal %f). " "desired_promo_size " SIZE_FORMAT "desired_eden_size " SIZE_FORMAT @@ -810,7 +810,7 @@ if (PrintAdaptiveSizePolicy && Verbose) { gclog_or_tty->print_cr( - "AdaptiveSizePolicy::compute_generation_free_space " + "AdaptiveSizePolicy::compute_generations_free_space " "adjusting tenured gen for footprint. " "starting promo size " SIZE_FORMAT " reduced promo size " SIZE_FORMAT, @@ -834,7 +834,7 @@ if (PrintAdaptiveSizePolicy && Verbose) { gclog_or_tty->print_cr( - "AdaptiveSizePolicy::compute_generation_free_space " + "AdaptiveSizePolicy::compute_generations_free_space " "adjusting eden for footprint. " " starting eden size " SIZE_FORMAT " reduced eden size " SIZE_FORMAT --- old/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2013-02-22 16:13:46.000000000 -0800 +++ new/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2013-02-22 16:13:46.000000000 -0800 @@ -336,12 +336,12 @@ // perform a Full GC? bool should_full_GC(size_t live_in_old_gen); - // Calculates optimial free space sizes for both the old and young + // Calculates optimal free space sizes for both the young and tenured // generations. Stores results in _eden_size and _promo_size. // Takes current used space in all generations as input, as well // as an indication if a full gc has just been performed, for use // in deciding if an OOM error should be thrown. - void compute_generation_free_space(size_t young_live, + void compute_generations_free_space(size_t young_live, size_t eden_live, size_t old_live, size_t cur_eden, // current eden in bytes --- old/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp 2013-02-22 16:13:46.000000000 -0800 +++ new/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp 2013-02-22 16:13:46.000000000 -0800 @@ -119,7 +119,7 @@ ps_size_policy()->change_old_gen_for_min_pauses()); } - // compute_generation_free_space() statistics + // compute_generations_free_space() statistics inline void update_avg_major_pause() { _avg_major_pause->set_value( --- old/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2013-02-22 16:13:47.000000000 -0800 +++ new/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2013-02-22 16:13:47.000000000 -0800 @@ -280,7 +280,7 @@ size_t max_eden_size = young_gen->max_size() - young_gen->from_space()->capacity_in_bytes() - young_gen->to_space()->capacity_in_bytes(); - size_policy->compute_generation_free_space(young_gen->used_in_bytes(), + size_policy->compute_generations_free_space(young_gen->used_in_bytes(), young_gen->eden_space()->used_in_bytes(), old_gen->used_in_bytes(), young_gen->eden_space()->capacity_in_bytes(), --- old/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-02-22 16:13:47.000000000 -0800 +++ new/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-02-22 16:13:47.000000000 -0800 @@ -2094,7 +2094,7 @@ size_t max_eden_size = young_gen->max_size() - young_gen->from_space()->capacity_in_bytes() - young_gen->to_space()->capacity_in_bytes(); - size_policy->compute_generation_free_space( + size_policy->compute_generations_free_space( young_gen->used_in_bytes(), young_gen->eden_space()->used_in_bytes(), old_gen->used_in_bytes(), --- old/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-02-22 16:13:48.000000000 -0800 +++ new/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-02-22 16:13:48.000000000 -0800 @@ -556,7 +556,7 @@ size_t max_eden_size = young_gen->max_size() - young_gen->from_space()->capacity_in_bytes() - young_gen->to_space()->capacity_in_bytes(); - size_policy->compute_generation_free_space(young_gen->used_in_bytes(), + size_policy->compute_generations_free_space(young_gen->used_in_bytes(), young_gen->eden_space()->used_in_bytes(), old_gen->used_in_bytes(), young_gen->eden_space()->capacity_in_bytes(), --- old/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2013-02-22 16:13:48.000000000 -0800 +++ new/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2013-02-22 16:13:48.000000000 -0800 @@ -467,7 +467,7 @@ (free_in_old_gen < (size_t) mem_free_old_limit && free_in_eden < (size_t) mem_free_eden_limit))) { gclog_or_tty->print_cr( - "PSAdaptiveSizePolicy::compute_generation_free_space limits:" + "PSAdaptiveSizePolicy::compute_generations_free_space limits:" " promo_limit: " SIZE_FORMAT " max_eden_size: " SIZE_FORMAT " total_free_limit: " SIZE_FORMAT