< prev index next >
src/hotspot/share/runtime/arguments.cpp
Print this page
*** 39,51 ****
#include "memory/filemap.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
#include "runtime/arguments.hpp"
#include "runtime/flags/jvmFlag.hpp"
- #include "runtime/flags/jvmFlagConstraintList.hpp"
- #include "runtime/flags/jvmFlagRangeList.hpp"
- #include "runtime/globals_extension.hpp"
#include "runtime/java.hpp"
#include "runtime/os.inline.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/safepointMechanism.hpp"
#include "runtime/vm_version.hpp"
--- 39,48 ----
*** 858,868 ****
ShouldNotReachHere();
}
}
static bool set_bool_flag(JVMFlag* flag, bool value, JVMFlag::Flags origin) {
! if (JVMFlag::boolAtPut(flag, &value, origin) == JVMFlag::SUCCESS) {
return true;
} else {
return false;
}
}
--- 855,865 ----
ShouldNotReachHere();
}
}
static bool set_bool_flag(JVMFlag* flag, bool value, JVMFlag::Flags origin) {
! if (JVMFlag::boolAtPut(flag, value, origin) == JVMFlag::SUCCESS) {
return true;
} else {
return false;
}
}
*** 873,883 ****
double v = strtod(value, &end);
if ((errno != 0) || (*end != 0)) {
return false;
}
! if (JVMFlag::doubleAtPut(flag, &v, origin) == JVMFlag::SUCCESS) {
return true;
}
return false;
}
--- 870,880 ----
double v = strtod(value, &end);
if ((errno != 0) || (*end != 0)) {
return false;
}
! if (JVMFlag::doubleAtPut(flag, v, origin) == JVMFlag::SUCCESS) {
return true;
}
return false;
}
*** 905,936 ****
if (flag->is_int()) {
int_v = (int) v;
if (is_neg) {
int_v = -int_v;
}
! return JVMFlag::intAtPut(flag, &int_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_uint()) {
uint uint_v = (uint) v;
! return JVMFlag::uintAtPut(flag, &uint_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_intx()) {
intx_v = (intx) v;
if (is_neg) {
intx_v = -intx_v;
}
! return JVMFlag::intxAtPut(flag, &intx_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_uintx()) {
uintx uintx_v = (uintx) v;
! return JVMFlag::uintxAtPut(flag, &uintx_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_uint64_t()) {
uint64_t uint64_t_v = (uint64_t) v;
! return JVMFlag::uint64_tAtPut(flag, &uint64_t_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_size_t()) {
size_t size_t_v = (size_t) v;
! return JVMFlag::size_tAtPut(flag, &size_t_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_double()) {
double double_v = (double) v;
! return JVMFlag::doubleAtPut(flag, &double_v, origin) == JVMFlag::SUCCESS;
} else {
return false;
}
}
--- 902,933 ----
if (flag->is_int()) {
int_v = (int) v;
if (is_neg) {
int_v = -int_v;
}
! return JVMFlag::intAtPut(flag, int_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_uint()) {
uint uint_v = (uint) v;
! return JVMFlag::uintAtPut(flag, uint_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_intx()) {
intx_v = (intx) v;
if (is_neg) {
intx_v = -intx_v;
}
! return JVMFlag::intxAtPut(flag, intx_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_uintx()) {
uintx uintx_v = (uintx) v;
! return JVMFlag::uintxAtPut(flag, uintx_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_uint64_t()) {
uint64_t uint64_t_v = (uint64_t) v;
! return JVMFlag::uint64_tAtPut(flag, uint64_t_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_size_t()) {
size_t size_t_v = (size_t) v;
! return JVMFlag::size_tAtPut(flag, size_t_v, origin) == JVMFlag::SUCCESS;
} else if (flag->is_double()) {
double double_v = (double) v;
! return JVMFlag::doubleAtPut(flag, double_v, origin) == JVMFlag::SUCCESS;
} else {
return false;
}
}
*** 1336,1346 ****
JVMFlag* fuzzy_matched = JVMFlag::fuzzy_match((const char*)argname, arg_len, true);
if (fuzzy_matched != NULL) {
jio_fprintf(defaultStream::error_stream(),
"Did you mean '%s%s%s'? ",
(fuzzy_matched->is_bool()) ? "(+/-)" : "",
! fuzzy_matched->_name,
(fuzzy_matched->is_bool()) ? "" : "=<value>");
}
}
// allow for commandline "commenting out" options like -XX:#+Verbose
--- 1333,1343 ----
JVMFlag* fuzzy_matched = JVMFlag::fuzzy_match((const char*)argname, arg_len, true);
if (fuzzy_matched != NULL) {
jio_fprintf(defaultStream::error_stream(),
"Did you mean '%s%s%s'? ",
(fuzzy_matched->is_bool()) ? "(+/-)" : "",
! fuzzy_matched->name(),
(fuzzy_matched->is_bool()) ? "" : "=<value>");
}
}
// allow for commandline "commenting out" options like -XX:#+Verbose
*** 3841,3853 ****
// Parse entry point called from JNI_CreateJavaVM
jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
assert(verify_special_jvm_flags(false), "deprecated and obsolete flag table inconsistent");
! // Initialize ranges and constraints
! JVMFlagRangeList::init();
! JVMFlagConstraintList::init();
// If flag "-XX:Flags=flags-file" is used it will be the first option to be processed.
const char* hotspotrc = ".hotspotrc";
bool settings_file_specified = false;
bool needs_hotspotrc_warning = false;
--- 3838,3850 ----
// Parse entry point called from JNI_CreateJavaVM
jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
assert(verify_special_jvm_flags(false), "deprecated and obsolete flag table inconsistent");
! // Initialize custom ranges
! JVMFlagCustomRange::init_all();
! JVMFlag::validate_flags();
// If flag "-XX:Flags=flags-file" is used it will be the first option to be processed.
const char* hotspotrc = ".hotspotrc";
bool settings_file_specified = false;
bool needs_hotspotrc_warning = false;
< prev index next >