src/share/vm/runtime/arguments.cpp

changeset 7611
1f60a119863a
parent 7497
4b41145051ab
child 7684
4b8dc0e79adb
child 7755
8f07afdc1cd1
equal deleted inserted replaced
7610:beee5a050416 7611:1f60a119863a
1570 } 1570 }
1571 } 1571 }
1572 1572
1573 void Arguments::select_gc() { 1573 void Arguments::select_gc() {
1574 if (!gc_selected()) { 1574 if (!gc_selected()) {
1575 ArgumentsExt::select_gc_ergonomically(); 1575 select_gc_ergonomically();
1576 } 1576 }
1577 } 1577 }
1578 1578
1579 void Arguments::set_ergonomics_flags() { 1579 void Arguments::set_ergonomics_flags() {
1580 select_gc(); 1580 select_gc();
2065 _max_heap_free_ratio = max_heap_free_ratio; 2065 _max_heap_free_ratio = max_heap_free_ratio;
2066 return true; 2066 return true;
2067 } 2067 }
2068 2068
2069 // Check consistency of GC selection 2069 // Check consistency of GC selection
2070 bool Arguments::check_gc_consistency_user() { 2070 bool Arguments::check_gc_consistency() {
2071 check_gclog_consistency(); 2071 check_gclog_consistency();
2072 bool status = true; 2072 bool status = true;
2073 // Ensure that the user has not selected conflicting sets 2073 // Ensure that the user has not selected conflicting sets
2074 // of collectors. [Note: this check is merely a user convenience; 2074 // of collectors. [Note: this check is merely a user convenience;
2075 // collectors over-ride each other so that only a non-conflicting 2075 // collectors over-ride each other so that only a non-conflicting
2231 if (GCTimeLimit == 100) { 2231 if (GCTimeLimit == 100) {
2232 // Turn off gc-overhead-limit-exceeded checks 2232 // Turn off gc-overhead-limit-exceeded checks
2233 FLAG_SET_DEFAULT(UseGCOverheadLimit, false); 2233 FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
2234 } 2234 }
2235 2235
2236 status = status && check_gc_consistency_user(); 2236 status = status && check_gc_consistency();
2237 status = status && check_stack_pages(); 2237 status = status && check_stack_pages();
2238 2238
2239 if (CMSIncrementalMode) { 2239 if (CMSIncrementalMode) {
2240 if (!UseConcMarkSweepGC) { 2240 if (!UseConcMarkSweepGC) {
2241 jio_fprintf(defaultStream::error_stream(), 2241 jio_fprintf(defaultStream::error_stream(),
4004 set_ergonomics_flags(); 4004 set_ergonomics_flags();
4005 4005
4006 set_shared_spaces_flags(); 4006 set_shared_spaces_flags();
4007 4007
4008 // Check the GC selections again. 4008 // Check the GC selections again.
4009 if (!ArgumentsExt::check_gc_consistency_ergo()) { 4009 if (!check_gc_consistency()) {
4010 return JNI_EINVAL; 4010 return JNI_EINVAL;
4011 } 4011 }
4012 4012
4013 if (TieredCompilation) { 4013 if (TieredCompilation) {
4014 set_tiered_flags(); 4014 set_tiered_flags();

mercurial