1.1 --- a/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp Tue Feb 16 14:11:44 2010 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp Tue Feb 23 23:13:23 2010 -0500
1.3 @@ -44,20 +44,20 @@
1.4 {
1.5
1.6 // Ergomonically select initial concurrent refinement parameters
1.7 - if (FLAG_IS_DEFAULT(G1ConcRefineGreenZone)) {
1.8 - FLAG_SET_DEFAULT(G1ConcRefineGreenZone, MAX2<int>(ParallelGCThreads, 1));
1.9 + if (FLAG_IS_DEFAULT(G1ConcRefinementGreenZone)) {
1.10 + FLAG_SET_DEFAULT(G1ConcRefinementGreenZone, MAX2<int>(ParallelGCThreads, 1));
1.11 }
1.12 - set_green_zone(G1ConcRefineGreenZone);
1.13 + set_green_zone(G1ConcRefinementGreenZone);
1.14
1.15 - if (FLAG_IS_DEFAULT(G1ConcRefineYellowZone)) {
1.16 - FLAG_SET_DEFAULT(G1ConcRefineYellowZone, green_zone() * 3);
1.17 + if (FLAG_IS_DEFAULT(G1ConcRefinementYellowZone)) {
1.18 + FLAG_SET_DEFAULT(G1ConcRefinementYellowZone, green_zone() * 3);
1.19 }
1.20 - set_yellow_zone(MAX2<int>(G1ConcRefineYellowZone, green_zone()));
1.21 + set_yellow_zone(MAX2<int>(G1ConcRefinementYellowZone, green_zone()));
1.22
1.23 - if (FLAG_IS_DEFAULT(G1ConcRefineRedZone)) {
1.24 - FLAG_SET_DEFAULT(G1ConcRefineRedZone, yellow_zone() * 2);
1.25 + if (FLAG_IS_DEFAULT(G1ConcRefinementRedZone)) {
1.26 + FLAG_SET_DEFAULT(G1ConcRefinementRedZone, yellow_zone() * 2);
1.27 }
1.28 - set_red_zone(MAX2<int>(G1ConcRefineRedZone, yellow_zone()));
1.29 + set_red_zone(MAX2<int>(G1ConcRefinementRedZone, yellow_zone()));
1.30 _n_worker_threads = thread_num();
1.31 // We need one extra thread to do the young gen rset size sampling.
1.32 _n_threads = _n_worker_threads + 1;
1.33 @@ -76,15 +76,15 @@
1.34 }
1.35
1.36 void ConcurrentG1Refine::reset_threshold_step() {
1.37 - if (FLAG_IS_DEFAULT(G1ConcRefineThresholdStep)) {
1.38 + if (FLAG_IS_DEFAULT(G1ConcRefinementThresholdStep)) {
1.39 _thread_threshold_step = (yellow_zone() - green_zone()) / (worker_thread_num() + 1);
1.40 } else {
1.41 - _thread_threshold_step = G1ConcRefineThresholdStep;
1.42 + _thread_threshold_step = G1ConcRefinementThresholdStep;
1.43 }
1.44 }
1.45
1.46 int ConcurrentG1Refine::thread_num() {
1.47 - return MAX2<int>((G1ParallelRSetThreads > 0) ? G1ParallelRSetThreads : ParallelGCThreads, 1);
1.48 + return MAX2<int>((G1ConcRefinementThreads > 0) ? G1ConcRefinementThreads : ParallelGCThreads, 1);
1.49 }
1.50
1.51 void ConcurrentG1Refine::init() {
