archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8133669: Remove unused code in Arguments

Browse source 
8133455: VM ignores setting of the -XX:MemoryRestriction flag

Reviewed-by: dholmes, kbarrett
This commit is contained in:
Jesper Wilhelmsson 2015-08-17 13:55:02 +02:00
parent a00b32c815
commit 0edc019938
3 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -81,8 +81,6 @@ const char* Arguments::_gc_log_filename = NULL;
bool Arguments::_has_profile = false;
size_t Arguments::_conservative_max_heap_alignment = 0;
size_t Arguments::_min_heap_size = 0;
uintx Arguments::_min_heap_free_ratio = 0;
uintx Arguments::_max_heap_free_ratio = 0;
Arguments::Mode Arguments::_mode = _mixed;
bool Arguments::_java_compiler = false;
bool Arguments::_xdebug_mode = false;
@ -1614,11 +1612,9 @@ void Arguments::set_parallel_gc_flags() {
// unless the user actually sets these flags.
if (FLAG_IS_DEFAULT(MinHeapFreeRatio)) {
FLAG_SET_DEFAULT(MinHeapFreeRatio, 0);
_min_heap_free_ratio = MinHeapFreeRatio;
}
if (FLAG_IS_DEFAULT(MaxHeapFreeRatio)) {
FLAG_SET_DEFAULT(MaxHeapFreeRatio, 100);
_max_heap_free_ratio = MaxHeapFreeRatio;
}
}
@ -3978,15 +3974,6 @@ jint Arguments::adjust_after_os() {
return JNI_OK;
}
// Any custom code post the 'CommandLineFlagConstraint::AfterErgo' constraint check
// can be done here. We pass a flag that specifies whether
// the check passed successfully
void Arguments::post_after_ergo_constraint_check(bool check_passed) {
// This does not set the flag itself, but stores the value in a safe place for later usage.
_min_heap_free_ratio = MinHeapFreeRatio;
_max_heap_free_ratio = MaxHeapFreeRatio;
}
int Arguments::PropertyList_count(SystemProperty* pl) {
int count = 0;
while(pl != NULL) {

10
hotspot/src/share/vm/runtime/arguments.hpp
View file

@ -288,10 +288,6 @@ class Arguments : AllStatic {
static uintx _min_heap_size;
// Used to store original flag values
static uintx _min_heap_free_ratio;
static uintx _max_heap_free_ratio;
// -Xrun arguments
static AgentLibraryList _libraryList;
static void add_init_library(const char* name, char* options)
@ -463,8 +459,6 @@ class Arguments : AllStatic {
static jint apply_ergo();
// Adjusts the arguments after the OS have adjusted the arguments
static jint adjust_after_os();
// Set any arguments that need to be set after the 'CommandLineFlagConstraint::AfterErgo' constraint check
static void post_after_ergo_constraint_check(bool check_passed);
static void set_gc_specific_flags();
static inline bool gc_selected(); // whether a gc has been selected
@ -526,10 +520,6 @@ class Arguments : AllStatic {
static size_t min_heap_size() { return _min_heap_size; }
static void set_min_heap_size(size_t v) { _min_heap_size = v; }
// Returns the original values of -XX:MinHeapFreeRatio and -XX:MaxHeapFreeRatio
static uintx min_heap_free_ratio() { return _min_heap_free_ratio; }
static uintx max_heap_free_ratio() { return _max_heap_free_ratio; }
// -Xrun
static AgentLibrary* libraries() { return _libraryList.first(); }
static bool init_libraries_at_startup() { return !_libraryList.is_empty(); }

1
hotspot/src/share/vm/runtime/thread.cpp
View file

@ -3331,7 +3331,6 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
// Final check of all 'AfterErgo' constraints after ergonomics which may change values.
bool constraint_result = CommandLineFlagConstraintList::check_constraints(CommandLineFlagConstraint::AfterErgo);
Arguments::post_after_ergo_constraint_check(constraint_result);
if (!constraint_result) {
return JNI_EINVAL;
}