Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 20408:76af788b6c16
8057623: add an extension class for argument handling
Reviewed-by: brutisso, mgerdin, tschatzl
author | jcoomes |
---|---|
date | Fri, 05 Sep 2014 12:36:37 -0700 |
parents | 8ec8971f511a |
children | 8ba0078861d4 8cb56c8cb30d |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Fri Sep 05 00:28:43 2014 +0200 +++ b/src/share/vm/runtime/arguments.cpp Fri Sep 05 12:36:37 2014 -0700 @@ -35,6 +35,7 @@ #include "oops/oop.inline.hpp" #include "prims/jvmtiExport.hpp" #include "runtime/arguments.hpp" +#include "runtime/arguments_ext.hpp" #include "runtime/globals_extension.hpp" #include "runtime/java.hpp" #include "services/management.hpp" @@ -1544,7 +1545,7 @@ void Arguments::select_gc() { if (!gc_selected()) { - select_gc_ergonomically(); + ArgumentsExt::select_gc_ergonomically(); } } @@ -2033,7 +2034,7 @@ } // Check consistency of GC selection -bool Arguments::check_gc_consistency() { +bool Arguments::check_gc_consistency_user() { check_gclog_consistency(); bool status = true; // Ensure that the user has not selected conflicting sets @@ -2199,7 +2200,7 @@ FLAG_SET_DEFAULT(UseGCOverheadLimit, false); } - status = status && check_gc_consistency(); + status = status && ArgumentsExt::check_gc_consistency_user(); status = status && check_stack_pages(); if (CMSIncrementalMode) { @@ -2447,8 +2448,6 @@ warning("The VM option CICompilerCountPerCPU overrides CICompilerCount."); } - status &= check_vm_args_consistency_ext(); - return status; } @@ -3419,7 +3418,7 @@ } } - if (!check_vm_args_consistency()) { + if (!ArgumentsExt::check_vm_args_consistency()) { return JNI_ERR; } @@ -3793,7 +3792,7 @@ set_shared_spaces_flags(); // Check the GC selections again. - if (!check_gc_consistency()) { + if (!ArgumentsExt::check_gc_consistency_ergo()) { return JNI_EINVAL; }