提交 9ca47aaa 编写于 作者: S sjohanss

8073944: Simplify ArgumentsExt and remove unneeded functionallity

Reviewed-by: kbarrett, dholmes
上级 c8480bc9
...@@ -1572,7 +1572,7 @@ void Arguments::select_gc_ergonomically() { ...@@ -1572,7 +1572,7 @@ void Arguments::select_gc_ergonomically() {
void Arguments::select_gc() { void Arguments::select_gc() {
if (!gc_selected()) { if (!gc_selected()) {
ArgumentsExt::select_gc_ergonomically(); select_gc_ergonomically();
} }
} }
...@@ -2067,7 +2067,7 @@ bool Arguments::verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_hea ...@@ -2067,7 +2067,7 @@ bool Arguments::verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_hea
} }
// Check consistency of GC selection // Check consistency of GC selection
bool Arguments::check_gc_consistency_user() { bool Arguments::check_gc_consistency() {
check_gclog_consistency(); check_gclog_consistency();
bool status = true; bool status = true;
// Ensure that the user has not selected conflicting sets // Ensure that the user has not selected conflicting sets
...@@ -2233,7 +2233,7 @@ bool Arguments::check_vm_args_consistency() { ...@@ -2233,7 +2233,7 @@ bool Arguments::check_vm_args_consistency() {
FLAG_SET_DEFAULT(UseGCOverheadLimit, false); FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
} }
status = status && check_gc_consistency_user(); status = status && check_gc_consistency();
status = status && check_stack_pages(); status = status && check_stack_pages();
if (CMSIncrementalMode) { if (CMSIncrementalMode) {
...@@ -4006,7 +4006,7 @@ jint Arguments::apply_ergo() { ...@@ -4006,7 +4006,7 @@ jint Arguments::apply_ergo() {
set_shared_spaces_flags(); set_shared_spaces_flags();
// Check the GC selections again. // Check the GC selections again.
if (!ArgumentsExt::check_gc_consistency_ergo()) { if (!check_gc_consistency()) {
return JNI_EINVAL; return JNI_EINVAL;
} }
......
...@@ -466,8 +466,7 @@ class Arguments : AllStatic { ...@@ -466,8 +466,7 @@ class Arguments : AllStatic {
static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio); static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
// Check for consistency in the selection of the garbage collector. // Check for consistency in the selection of the garbage collector.
static bool check_gc_consistency_user(); // Check user-selected gc static bool check_gc_consistency(); // Check user-selected gc
static inline bool check_gc_consistency_ergo(); // Check ergonomic-selected gc
static void check_deprecated_gcs(); static void check_deprecated_gcs();
static void check_deprecated_gc_flags(); static void check_deprecated_gc_flags();
// Check consistecy or otherwise of VM argument settings // Check consistecy or otherwise of VM argument settings
...@@ -615,8 +614,4 @@ bool Arguments::gc_selected() { ...@@ -615,8 +614,4 @@ bool Arguments::gc_selected() {
UseParNewGC || UseSerialGC; UseParNewGC || UseSerialGC;
} }
bool Arguments::check_gc_consistency_ergo() {
return check_gc_consistency_user();
}
#endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP
...@@ -30,22 +30,12 @@ ...@@ -30,22 +30,12 @@
class ArgumentsExt: AllStatic { class ArgumentsExt: AllStatic {
public: public:
static inline void select_gc_ergonomically();
static inline void set_gc_specific_flags(); static inline void set_gc_specific_flags();
static inline bool check_gc_consistency_ergo();
static void process_options(const JavaVMInitArgs* args) {} static void process_options(const JavaVMInitArgs* args) {}
}; };
void ArgumentsExt::select_gc_ergonomically() {
Arguments::select_gc_ergonomically();
}
void ArgumentsExt::set_gc_specific_flags() { void ArgumentsExt::set_gc_specific_flags() {
Arguments::set_gc_specific_flags(); Arguments::set_gc_specific_flags();
} }
bool ArgumentsExt::check_gc_consistency_ergo() {
return Arguments::check_gc_consistency_ergo();
}
#endif // SHARE_VM_RUNTIME_ARGUMENTS_EXT_HPP #endif // SHARE_VM_RUNTIME_ARGUMENTS_EXT_HPP
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册