archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8007762: Rename a bunch of methods in size policy across collectors

Browse source 
Rename: compute_generations_free_space() = compute_eden_space_size() + compute_old_gen_free_space(); update related logging messages

Reviewed-by: jmasa, johnc, tschatzl, brutisso
This commit is contained in:
Tao Mao 2013-05-22 11:11:47 -07:00 • committed by Tao Mao
parent a50a5688af
commit 1e80919f4c
9 changed files with 41 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -969,8 +969,8 @@ size_t CMSAdaptiveSizePolicy::promo_increment_aligned_up(size_t cur_promo) {
} }
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 max_eden_size)
{ {
size_t desired_eden_size = cur_eden; size_t desired_eden_size = cur_eden;
size_t eden_limit = max_eden_size; size_t eden_limit = max_eden_size;
@ -978,7 +978,7 @@ void CMSAdaptiveSizePolicy::compute_young_generation_free_space(size_t cur_eden,
// Printout input // Printout input
if (PrintGC && PrintAdaptiveSizePolicy) { if (PrintGC && PrintAdaptiveSizePolicy) {
gclog_or_tty->print_cr( gclog_or_tty->print_cr(
"CMSAdaptiveSizePolicy::compute_young_generation_free_space: " "CMSAdaptiveSizePolicy::compute_eden_space_size: "
"cur_eden " SIZE_FORMAT, "cur_eden " SIZE_FORMAT,
cur_eden); cur_eden);
} }
@ -1024,7 +1024,7 @@ void CMSAdaptiveSizePolicy::compute_young_generation_free_space(size_t cur_eden,
if (PrintGC && PrintAdaptiveSizePolicy) { if (PrintGC && PrintAdaptiveSizePolicy) {
gclog_or_tty->print_cr( gclog_or_tty->print_cr(
"CMSAdaptiveSizePolicy::compute_young_generation_free_space limits:" "CMSAdaptiveSizePolicy::compute_eden_space_size limits:"
" desired_eden_size: " SIZE_FORMAT " desired_eden_size: " SIZE_FORMAT
" old_eden_size: " SIZE_FORMAT, " old_eden_size: " SIZE_FORMAT,
desired_eden_size, cur_eden); desired_eden_size, cur_eden);

6
hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -436,8 +436,8 @@ class CMSAdaptiveSizePolicy : public AdaptiveSizePolicy {
size_t generation_alignment() { return _generation_alignment; } 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); size_t max_eden_size);
// Calculates new survivor space size; returns a new tenuring threshold // Calculates new survivor space size; returns a new tenuring threshold
// value. Stores new survivor size in _survivor_size. // value. Stores new survivor size in _survivor_size.
virtual uint compute_survivor_space_size_and_threshold( virtual uint compute_survivor_space_size_and_threshold(

5
hotspot/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -585,8 +585,7 @@ void ASParNewGeneration::compute_new_size() {
size_policy->avg_young_live()->sample(used()); size_policy->avg_young_live()->sample(used());
size_policy->avg_eden_live()->sample(eden()->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());
max_gen_size());
resize(size_policy->calculated_eden_size_in_bytes(), resize(size_policy->calculated_eden_size_in_bytes(),
size_policy->calculated_survivor_size_in_bytes()); size_policy->calculated_survivor_size_in_bytes());

12
hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp
View file

@ -194,7 +194,7 @@ void PSAdaptiveSizePolicy::clear_generation_free_space_flags() {
// If this is not a full GC, only test and modify the young generation. // 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 young_live,
size_t eden_live, size_t eden_live,
size_t old_live, size_t old_live,
@ -729,7 +729,7 @@ void PSAdaptiveSizePolicy::adjust_promo_for_pause_time(bool is_full_gc,
if (PrintAdaptiveSizePolicy && Verbose) { if (PrintAdaptiveSizePolicy && Verbose) {
gclog_or_tty->print_cr( gclog_or_tty->print_cr(
"PSAdaptiveSizePolicy::compute_old_gen_free_space " "PSAdaptiveSizePolicy::adjust_promo_for_pause_time "
"adjusting gen sizes for major pause (avg %f goal %f). " "adjusting gen sizes for major pause (avg %f goal %f). "
"desired_promo_size " SIZE_FORMAT " promo delta " SIZE_FORMAT, "desired_promo_size " SIZE_FORMAT " promo delta " SIZE_FORMAT,
_avg_major_pause->average(), gc_pause_goal_sec(), _avg_major_pause->average(), gc_pause_goal_sec(),
@ -786,7 +786,7 @@ void PSAdaptiveSizePolicy::adjust_eden_for_pause_time(bool is_full_gc,
if (PrintAdaptiveSizePolicy && Verbose) { if (PrintAdaptiveSizePolicy && Verbose) {
gclog_or_tty->print_cr( gclog_or_tty->print_cr(
"PSAdaptiveSizePolicy::compute_eden_space_size " "PSAdaptiveSizePolicy::adjust_eden_for_pause_time "
"adjusting gen sizes for major pause (avg %f goal %f). " "adjusting gen sizes for major pause (avg %f goal %f). "
"desired_eden_size " SIZE_FORMAT " eden delta " SIZE_FORMAT, "desired_eden_size " SIZE_FORMAT " eden delta " SIZE_FORMAT,
_avg_major_pause->average(), gc_pause_goal_sec(), _avg_major_pause->average(), gc_pause_goal_sec(),
@ -1001,7 +1001,7 @@ size_t PSAdaptiveSizePolicy::adjust_promo_for_footprint(
if (PrintAdaptiveSizePolicy && Verbose) { if (PrintAdaptiveSizePolicy && Verbose) {
gclog_or_tty->print_cr( gclog_or_tty->print_cr(
"AdaptiveSizePolicy::compute_generation_free_space " "AdaptiveSizePolicy::adjust_promo_for_footprint "
"adjusting tenured gen for footprint. " "adjusting tenured gen for footprint. "
"starting promo size " SIZE_FORMAT "starting promo size " SIZE_FORMAT
" reduced promo size " SIZE_FORMAT, " reduced promo size " SIZE_FORMAT,
@ -1025,7 +1025,7 @@ size_t PSAdaptiveSizePolicy::adjust_eden_for_footprint(
if (PrintAdaptiveSizePolicy && Verbose) { if (PrintAdaptiveSizePolicy && Verbose) {
gclog_or_tty->print_cr( gclog_or_tty->print_cr(
"AdaptiveSizePolicy::compute_generation_free_space " "AdaptiveSizePolicy::adjust_eden_for_footprint "
"adjusting eden for footprint. " "adjusting eden for footprint. "
" starting eden size " SIZE_FORMAT " starting eden size " SIZE_FORMAT
" reduced eden size " SIZE_FORMAT " reduced eden size " SIZE_FORMAT
@ -1280,7 +1280,7 @@ void PSAdaptiveSizePolicy::update_averages(bool is_survivor_overflow,
if (PrintAdaptiveSizePolicy) { if (PrintAdaptiveSizePolicy) {
gclog_or_tty->print( gclog_or_tty->print(
"AdaptiveSizePolicy::compute_survivor_space_size_and_thresh:" "AdaptiveSizePolicy::update_averages:"
" survived: " SIZE_FORMAT " survived: " SIZE_FORMAT
" promoted: " SIZE_FORMAT " promoted: " SIZE_FORMAT
" overflow: %s", " overflow: %s",

14
hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp
View file

@ -344,13 +344,13 @@ class PSAdaptiveSizePolicy : public AdaptiveSizePolicy {
// Takes current used space in all generations as input, as well // Takes current used space in all generations as input, as well
// as an indication if a full gc has just been performed, for use // as an indication if a full gc has just been performed, for use
// in deciding if an OOM error should be thrown. // 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 eden_live,
size_t old_live, size_t old_live,
size_t cur_eden, // current eden in bytes size_t cur_eden, // current eden in bytes
size_t max_old_gen_size, size_t max_old_gen_size,
size_t max_eden_size, size_t max_eden_size,
bool is_full_gc); bool is_full_gc);
void compute_eden_space_size(size_t young_live, void compute_eden_space_size(size_t young_live,
size_t eden_live, size_t eden_live,

4
hotspot/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -119,7 +119,7 @@ class PSGCAdaptivePolicyCounters : public GCAdaptivePolicyCounters {
ps_size_policy()->change_old_gen_for_min_pauses()); 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() { inline void update_avg_major_pause() {
_avg_major_pause->set_value( _avg_major_pause->set_value(

14
hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
View file

@ -290,13 +290,13 @@ bool PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) {
// Used for diagnostics // Used for diagnostics
size_policy->clear_generation_free_space_flags(); size_policy->clear_generation_free_space_flags();
size_policy->compute_generation_free_space(young_live, size_policy->compute_generations_free_space(young_live,
eden_live, eden_live,
old_live, old_live,
cur_eden, cur_eden,
max_old_gen_size, max_old_gen_size,
max_eden_size, max_eden_size,
true /* full gc*/); true /* full gc*/);
size_policy->check_gc_overhead_limit(young_live, size_policy->check_gc_overhead_limit(young_live,
eden_live, eden_live,

14
hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
View file

@ -2101,13 +2101,13 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
// Used for diagnostics // Used for diagnostics
size_policy->clear_generation_free_space_flags(); size_policy->clear_generation_free_space_flags();
size_policy->compute_generation_free_space(young_live, size_policy->compute_generations_free_space(young_live,
eden_live, eden_live,
old_live, old_live,
cur_eden, cur_eden,
max_old_gen_size, max_old_gen_size,
max_eden_size, max_eden_size,
true /* full gc*/); true /* full gc*/);
size_policy->check_gc_overhead_limit(young_live, size_policy->check_gc_overhead_limit(young_live,
eden_live, eden_live,

4
hotspot/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -467,7 +467,7 @@ void AdaptiveSizePolicy::check_gc_overhead_limit(
(free_in_old_gen < (size_t) mem_free_old_limit && (free_in_old_gen < (size_t) mem_free_old_limit &&
free_in_eden < (size_t) mem_free_eden_limit))) { free_in_eden < (size_t) mem_free_eden_limit))) {
gclog_or_tty->print_cr( gclog_or_tty->print_cr(
"PSAdaptiveSizePolicy::compute_generation_free_space limits:" "PSAdaptiveSizePolicy::check_gc_overhead_limit:"
" promo_limit: " SIZE_FORMAT " promo_limit: " SIZE_FORMAT
" max_eden_size: " SIZE_FORMAT " max_eden_size: " SIZE_FORMAT
" total_free_limit: " SIZE_FORMAT " total_free_limit: " SIZE_FORMAT