Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/arguments.hpp @ 23286:dd9cc155639c
Merge with jdk8u66-b17
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Thu, 07 Jan 2016 17:28:46 +0100 |
parents | 4f6caa445b92 1f60a119863a |
children | f6de9aff9991 |
comparison
equal
deleted
inserted
replaced
22786:ac649db7fec4 | 23286:dd9cc155639c |
---|---|
464 // Verifies that the given value will fit as a MaxHeapFreeRatio. If not, an error | 464 // Verifies that the given value will fit as a MaxHeapFreeRatio. If not, an error |
465 // message is returned in the provided buffer. | 465 // message is returned in the provided buffer. |
466 static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio); | 466 static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio); |
467 | 467 |
468 // Check for consistency in the selection of the garbage collector. | 468 // Check for consistency in the selection of the garbage collector. |
469 static bool check_gc_consistency_user(); // Check user-selected gc | 469 static bool check_gc_consistency(); // Check user-selected gc |
470 static inline bool check_gc_consistency_ergo(); // Check ergonomic-selected gc | |
471 static void check_deprecated_gcs(); | 470 static void check_deprecated_gcs(); |
472 static void check_deprecated_gc_flags(); | 471 static void check_deprecated_gc_flags(); |
473 // Check consistecy or otherwise of VM argument settings | 472 // Check consistecy or otherwise of VM argument settings |
474 static bool check_vm_args_consistency(); | 473 static bool check_vm_args_consistency(); |
475 // Check stack pages settings | 474 // Check stack pages settings |
613 bool Arguments::gc_selected() { | 612 bool Arguments::gc_selected() { |
614 return UseConcMarkSweepGC || UseG1GC || UseParallelGC || UseParallelOldGC || | 613 return UseConcMarkSweepGC || UseG1GC || UseParallelGC || UseParallelOldGC || |
615 UseParNewGC || UseSerialGC; | 614 UseParNewGC || UseSerialGC; |
616 } | 615 } |
617 | 616 |
618 bool Arguments::check_gc_consistency_ergo() { | |
619 return check_gc_consistency_user(); | |
620 } | |
621 | |
622 #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP | 617 #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP |