Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Fri, 24 May 2013 14:16:41 +0200
- author
- jwilhelm
- date
- Fri, 24 May 2013 14:16:41 +0200
- changeset 5193
- 0886b99a4d1b
- parent 5167
- 62890ed7e2a8
- parent 5192
- 14d3f71f831d
- child 5194
- eda078b01c65
Merge
1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Fri May 24 09:29:57 2013 +0200 1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Fri May 24 14:16:41 2013 +0200 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -969,8 +969,8 @@ 1.11 } 1.12 1.13 1.14 -void CMSAdaptiveSizePolicy::compute_young_generation_free_space(size_t cur_eden, 1.15 - size_t max_eden_size) 1.16 +void CMSAdaptiveSizePolicy::compute_eden_space_size(size_t cur_eden, 1.17 + size_t max_eden_size) 1.18 { 1.19 size_t desired_eden_size = cur_eden; 1.20 size_t eden_limit = max_eden_size; 1.21 @@ -978,7 +978,7 @@ 1.22 // Printout input 1.23 if (PrintGC && PrintAdaptiveSizePolicy) { 1.24 gclog_or_tty->print_cr( 1.25 - "CMSAdaptiveSizePolicy::compute_young_generation_free_space: " 1.26 + "CMSAdaptiveSizePolicy::compute_eden_space_size: " 1.27 "cur_eden " SIZE_FORMAT, 1.28 cur_eden); 1.29 } 1.30 @@ -1024,7 +1024,7 @@ 1.31 1.32 if (PrintGC && PrintAdaptiveSizePolicy) { 1.33 gclog_or_tty->print_cr( 1.34 - "CMSAdaptiveSizePolicy::compute_young_generation_free_space limits:" 1.35 + "CMSAdaptiveSizePolicy::compute_eden_space_size limits:" 1.36 " desired_eden_size: " SIZE_FORMAT 1.37 " old_eden_size: " SIZE_FORMAT, 1.38 desired_eden_size, cur_eden);
2.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp Fri May 24 09:29:57 2013 +0200 2.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp Fri May 24 14:16:41 2013 +0200 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it 2.10 @@ -436,8 +436,8 @@ 2.11 2.12 size_t generation_alignment() { return _generation_alignment; } 2.13 2.14 - virtual void compute_young_generation_free_space(size_t cur_eden, 2.15 - size_t max_eden_size); 2.16 + virtual void compute_eden_space_size(size_t cur_eden, 2.17 + size_t max_eden_size); 2.18 // Calculates new survivor space size; returns a new tenuring threshold 2.19 // value. Stores new survivor size in _survivor_size. 2.20 virtual uint compute_survivor_space_size_and_threshold(
3.1 --- a/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp Fri May 24 09:29:57 2013 +0200 3.2 +++ b/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp Fri May 24 14:16:41 2013 +0200 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 3.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 * 3.9 * This code is free software; you can redistribute it and/or modify it 3.10 @@ -585,8 +585,7 @@ 3.11 size_policy->avg_young_live()->sample(used()); 3.12 size_policy->avg_eden_live()->sample(eden()->used()); 3.13 3.14 - size_policy->compute_young_generation_free_space(eden()->capacity(), 3.15 - max_gen_size()); 3.16 + size_policy->compute_eden_space_size(eden()->capacity(), max_gen_size()); 3.17 3.18 resize(size_policy->calculated_eden_size_in_bytes(), 3.19 size_policy->calculated_survivor_size_in_bytes());
4.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp Fri May 24 09:29:57 2013 +0200 4.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp Fri May 24 14:16:41 2013 +0200 4.3 @@ -194,7 +194,7 @@ 4.4 4.5 // If this is not a full GC, only test and modify the young generation. 4.6 4.7 -void PSAdaptiveSizePolicy::compute_generation_free_space( 4.8 +void PSAdaptiveSizePolicy::compute_generations_free_space( 4.9 size_t young_live, 4.10 size_t eden_live, 4.11 size_t old_live, 4.12 @@ -729,7 +729,7 @@ 4.13 4.14 if (PrintAdaptiveSizePolicy && Verbose) { 4.15 gclog_or_tty->print_cr( 4.16 - "PSAdaptiveSizePolicy::compute_old_gen_free_space " 4.17 + "PSAdaptiveSizePolicy::adjust_promo_for_pause_time " 4.18 "adjusting gen sizes for major pause (avg %f goal %f). " 4.19 "desired_promo_size " SIZE_FORMAT " promo delta " SIZE_FORMAT, 4.20 _avg_major_pause->average(), gc_pause_goal_sec(), 4.21 @@ -786,7 +786,7 @@ 4.22 4.23 if (PrintAdaptiveSizePolicy && Verbose) { 4.24 gclog_or_tty->print_cr( 4.25 - "PSAdaptiveSizePolicy::compute_eden_space_size " 4.26 + "PSAdaptiveSizePolicy::adjust_eden_for_pause_time " 4.27 "adjusting gen sizes for major pause (avg %f goal %f). " 4.28 "desired_eden_size " SIZE_FORMAT " eden delta " SIZE_FORMAT, 4.29 _avg_major_pause->average(), gc_pause_goal_sec(), 4.30 @@ -1001,7 +1001,7 @@ 4.31 4.32 if (PrintAdaptiveSizePolicy && Verbose) { 4.33 gclog_or_tty->print_cr( 4.34 - "AdaptiveSizePolicy::compute_generation_free_space " 4.35 + "AdaptiveSizePolicy::adjust_promo_for_footprint " 4.36 "adjusting tenured gen for footprint. " 4.37 "starting promo size " SIZE_FORMAT 4.38 " reduced promo size " SIZE_FORMAT, 4.39 @@ -1025,7 +1025,7 @@ 4.40 4.41 if (PrintAdaptiveSizePolicy && Verbose) { 4.42 gclog_or_tty->print_cr( 4.43 - "AdaptiveSizePolicy::compute_generation_free_space " 4.44 + "AdaptiveSizePolicy::adjust_eden_for_footprint " 4.45 "adjusting eden for footprint. " 4.46 " starting eden size " SIZE_FORMAT 4.47 " reduced eden size " SIZE_FORMAT 4.48 @@ -1280,7 +1280,7 @@ 4.49 4.50 if (PrintAdaptiveSizePolicy) { 4.51 gclog_or_tty->print( 4.52 - "AdaptiveSizePolicy::compute_survivor_space_size_and_thresh:" 4.53 + "AdaptiveSizePolicy::update_averages:" 4.54 " survived: " SIZE_FORMAT 4.55 " promoted: " SIZE_FORMAT 4.56 " overflow: %s",
5.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp Fri May 24 09:29:57 2013 +0200 5.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp Fri May 24 14:16:41 2013 +0200 5.3 @@ -344,13 +344,13 @@ 5.4 // Takes current used space in all generations as input, as well 5.5 // as an indication if a full gc has just been performed, for use 5.6 // in deciding if an OOM error should be thrown. 5.7 - void compute_generation_free_space(size_t young_live, 5.8 - size_t eden_live, 5.9 - size_t old_live, 5.10 - size_t cur_eden, // current eden in bytes 5.11 - size_t max_old_gen_size, 5.12 - size_t max_eden_size, 5.13 - bool is_full_gc); 5.14 + void compute_generations_free_space(size_t young_live, 5.15 + size_t eden_live, 5.16 + size_t old_live, 5.17 + size_t cur_eden, // current eden in bytes 5.18 + size_t max_old_gen_size, 5.19 + size_t max_eden_size, 5.20 + bool is_full_gc); 5.21 5.22 void compute_eden_space_size(size_t young_live, 5.23 size_t eden_live,
6.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp Fri May 24 09:29:57 2013 +0200 6.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp Fri May 24 14:16:41 2013 +0200 6.3 @@ -1,5 +1,5 @@ 6.4 /* 6.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 6.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 6.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 * 6.9 * This code is free software; you can redistribute it and/or modify it 6.10 @@ -119,7 +119,7 @@ 6.11 ps_size_policy()->change_old_gen_for_min_pauses()); 6.12 } 6.13 6.14 - // compute_generation_free_space() statistics 6.15 + // compute_generations_free_space() statistics 6.16 6.17 inline void update_avg_major_pause() { 6.18 _avg_major_pause->set_value(
7.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Fri May 24 09:29:57 2013 +0200 7.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Fri May 24 14:16:41 2013 +0200 7.3 @@ -290,13 +290,13 @@ 7.4 // Used for diagnostics 7.5 size_policy->clear_generation_free_space_flags(); 7.6 7.7 - size_policy->compute_generation_free_space(young_live, 7.8 - eden_live, 7.9 - old_live, 7.10 - cur_eden, 7.11 - max_old_gen_size, 7.12 - max_eden_size, 7.13 - true /* full gc*/); 7.14 + size_policy->compute_generations_free_space(young_live, 7.15 + eden_live, 7.16 + old_live, 7.17 + cur_eden, 7.18 + max_old_gen_size, 7.19 + max_eden_size, 7.20 + true /* full gc*/); 7.21 7.22 size_policy->check_gc_overhead_limit(young_live, 7.23 eden_live,
8.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Fri May 24 09:29:57 2013 +0200 8.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Fri May 24 14:16:41 2013 +0200 8.3 @@ -2101,13 +2101,13 @@ 8.4 // Used for diagnostics 8.5 size_policy->clear_generation_free_space_flags(); 8.6 8.7 - size_policy->compute_generation_free_space(young_live, 8.8 - eden_live, 8.9 - old_live, 8.10 - cur_eden, 8.11 - max_old_gen_size, 8.12 - max_eden_size, 8.13 - true /* full gc*/); 8.14 + size_policy->compute_generations_free_space(young_live, 8.15 + eden_live, 8.16 + old_live, 8.17 + cur_eden, 8.18 + max_old_gen_size, 8.19 + max_eden_size, 8.20 + true /* full gc*/); 8.21 8.22 size_policy->check_gc_overhead_limit(young_live, 8.23 eden_live,
9.1 --- a/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp Fri May 24 09:29:57 2013 +0200 9.2 +++ b/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp Fri May 24 14:16:41 2013 +0200 9.3 @@ -1,5 +1,5 @@ 9.4 /* 9.5 - * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. 9.6 + * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. 9.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.8 * 9.9 * This code is free software; you can redistribute it and/or modify it 9.10 @@ -467,7 +467,7 @@ 9.11 (free_in_old_gen < (size_t) mem_free_old_limit && 9.12 free_in_eden < (size_t) mem_free_eden_limit))) { 9.13 gclog_or_tty->print_cr( 9.14 - "PSAdaptiveSizePolicy::compute_generation_free_space limits:" 9.15 + "PSAdaptiveSizePolicy::check_gc_overhead_limit:" 9.16 " promo_limit: " SIZE_FORMAT 9.17 " max_eden_size: " SIZE_FORMAT 9.18 " total_free_limit: " SIZE_FORMAT
10.1 --- a/src/share/vm/memory/universe.cpp Fri May 24 09:29:57 2013 +0200 10.2 +++ b/src/share/vm/memory/universe.cpp Fri May 24 14:16:41 2013 +0200 10.3 @@ -228,11 +228,8 @@ 10.4 10.5 void Universe::check_alignment(uintx size, uintx alignment, const char* name) { 10.6 if (size < alignment || size % alignment != 0) { 10.7 - ResourceMark rm; 10.8 - stringStream st; 10.9 - st.print("Size of %s (" UINTX_FORMAT " bytes) must be aligned to " UINTX_FORMAT " bytes", name, size, alignment); 10.10 - char* error = st.as_string(); 10.11 - vm_exit_during_initialization(error); 10.12 + vm_exit_during_initialization( 10.13 + err_msg("Size of %s (" UINTX_FORMAT " bytes) must be aligned to " UINTX_FORMAT " bytes", name, size, alignment)); 10.14 } 10.15 } 10.16 10.17 @@ -916,7 +913,7 @@ 10.18 } 10.19 10.20 if (!total_rs.is_reserved()) { 10.21 - vm_exit_during_initialization(err_msg("Could not reserve enough space for object heap %d bytes", total_reserved)); 10.22 + vm_exit_during_initialization(err_msg("Could not reserve enough space for " SIZE_FORMAT "KB object heap", total_reserved/K)); 10.23 return total_rs; 10.24 } 10.25
