--- old/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-04-20 13:35:45.028863846 +0300 +++ new/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2015-04-20 13:35:44.780863837 +0300 @@ -3643,9 +3643,9 @@ bool CMSCollector::do_marking_mt() { assert(ConcGCThreads > 0 && conc_workers() != NULL, "precondition"); uint num_workers = AdaptiveSizePolicy::calc_active_conc_workers( - conc_workers()->total_workers(), - conc_workers()->active_workers(), - Threads::number_of_non_daemon_threads()); + conc_workers()->total_workers(), + conc_workers()->active_workers(), + Threads::number_of_non_daemon_threads()); conc_workers()->set_active_workers(num_workers); CompactibleFreeListSpace* cms_space = _cmsGen->cmsSpace(); --- old/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-04-20 13:35:46.084863883 +0300 +++ new/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2015-04-20 13:35:45.820863873 +0300 @@ -913,9 +913,9 @@ FlexibleWorkGang* workers = gch->workers(); assert(workers != NULL, "Need workgang for parallel work"); uint active_workers = - AdaptiveSizePolicy::calc_active_workers(workers->total_workers(), - workers->active_workers(), - Threads::number_of_non_daemon_threads()); + AdaptiveSizePolicy::calc_active_workers(workers->total_workers(), + workers->active_workers(), + Threads::number_of_non_daemon_threads()); workers->set_active_workers(active_workers); _old_gen = gch->old_gen(); --- old/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2015-04-20 13:35:46.764863906 +0300 +++ new/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp 2015-04-20 13:35:46.588863900 +0300 @@ -98,9 +98,9 @@ // Use the larger. uint AdaptiveSizePolicy::calc_default_active_workers(uintx total_workers, - const uintx min_workers, - uintx active_workers, - uintx application_workers) { + const uintx min_workers, + uintx active_workers, + uintx application_workers) { // If the user has specifically set the number of // GC threads, use them. @@ -179,8 +179,8 @@ } uint AdaptiveSizePolicy::calc_active_workers(uintx total_workers, - uintx active_workers, - uintx application_workers) { + uintx active_workers, + uintx application_workers) { // If the user has specifically set the number of // GC threads, use them. @@ -203,17 +203,17 @@ } uint AdaptiveSizePolicy::calc_active_conc_workers(uintx total_workers, - uintx active_workers, - uintx application_workers) { + uintx active_workers, + uintx application_workers) { if (!UseDynamicNumberOfGCThreads || (!FLAG_IS_DEFAULT(ConcGCThreads) && !ForceDynamicNumberOfGCThreads)) { return ConcGCThreads; } else { uint no_of_gc_threads = calc_default_active_workers( - total_workers, - 1, /* Minimum number of workers */ - active_workers, - application_workers); + total_workers, + 1, /* Minimum number of workers */ + active_workers, + application_workers); return no_of_gc_threads; } } --- old/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp 2015-04-20 13:35:47.460863930 +0300 +++ new/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp 2015-04-20 13:35:47.244863923 +0300 @@ -344,9 +344,9 @@ // Return number default GC threads to use in the next GC. static uint calc_default_active_workers(uintx total_workers, - const uintx min_workers, - uintx active_workers, - uintx application_workers); + const uintx min_workers, + uintx active_workers, + uintx application_workers); // Return number of GC threads to use in the next GC. // This is called sparingly so as not to change the @@ -359,13 +359,13 @@ // a CMS parallel remark uses the same number of GC // workers as the most recent ParNew collection. static uint calc_active_workers(uintx total_workers, - uintx active_workers, - uintx application_workers); + uintx active_workers, + uintx application_workers); // Return number of GC threads to use in the next concurrent GC phase. static uint calc_active_conc_workers(uintx total_workers, - uintx active_workers, - uintx application_workers); + uintx active_workers, + uintx application_workers); bool is_gc_cms_adaptive_size_policy() { return kind() == _gc_cms_adaptive_size_policy;