8213760: os::obsolete_option is obsolete and should be removed
Reviewed-by: jiangli, igerasim, stuefe
This commit is contained in:
parent
a8a34764b2
commit
ea22b27348
@ -41,10 +41,6 @@ inline int os::file_name_strncmp(const char* s1, const char* s2, size_t num) {
|
|||||||
return strncmp(s1, s2, num);
|
return strncmp(s1, s2, num);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool os::obsolete_option(const JavaVMOption *option) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool os::uses_stack_guard_pages() {
|
inline bool os::uses_stack_guard_pages() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,6 @@ inline int os::file_name_strncmp(const char* s1, const char* s2, size_t num) {
|
|||||||
return strncmp(s1, s2, num);
|
return strncmp(s1, s2, num);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool os::obsolete_option(const JavaVMOption *option) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool os::uses_stack_guard_pages() {
|
inline bool os::uses_stack_guard_pages() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,6 @@ inline int os::file_name_strncmp(const char* s1, const char* s2, size_t num) {
|
|||||||
return strncmp(s1, s2, num);
|
return strncmp(s1, s2, num);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool os::obsolete_option(const JavaVMOption *option) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool os::uses_stack_guard_pages() {
|
inline bool os::uses_stack_guard_pages() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -700,19 +700,6 @@ void os::breakpoint() {
|
|||||||
BREAKPOINT;
|
BREAKPOINT;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool os::obsolete_option(const JavaVMOption *option) {
|
|
||||||
if (!strncmp(option->optionString, "-Xt", 3)) {
|
|
||||||
return true;
|
|
||||||
} else if (!strncmp(option->optionString, "-Xtm", 4)) {
|
|
||||||
return true;
|
|
||||||
} else if (!strncmp(option->optionString, "-Xverifyheap", 12)) {
|
|
||||||
return true;
|
|
||||||
} else if (!strncmp(option->optionString, "-Xmaxjitcodesize", 16)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool os::Solaris::valid_stack_address(Thread* thread, address sp) {
|
bool os::Solaris::valid_stack_address(Thread* thread, address sp) {
|
||||||
address stackStart = (address)thread->stack_base();
|
address stackStart = (address)thread->stack_base();
|
||||||
address stackEnd = (address)(stackStart - (address)thread->stack_size());
|
address stackEnd = (address)(stackStart - (address)thread->stack_size());
|
||||||
|
@ -45,10 +45,6 @@ inline void* os::dll_lookup(void *lib, const char *name) {
|
|||||||
return (void*)::GetProcAddress((HMODULE)lib, name);
|
return (void*)::GetProcAddress((HMODULE)lib, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool os::obsolete_option(const JavaVMOption *option) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool os::uses_stack_guard_pages() {
|
inline bool os::uses_stack_guard_pages() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -2074,17 +2074,10 @@ bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
|
|||||||
option_type = ++spacer; // Set both to the empty string.
|
option_type = ++spacer; // Set both to the empty string.
|
||||||
}
|
}
|
||||||
|
|
||||||
if (os::obsolete_option(option)) {
|
jio_fprintf(defaultStream::error_stream(),
|
||||||
jio_fprintf(defaultStream::error_stream(),
|
"Unrecognized %s%soption: %s\n", option_type, spacer,
|
||||||
"Obsolete %s%soption: %s\n", option_type, spacer,
|
option->optionString);
|
||||||
option->optionString);
|
return true;
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
jio_fprintf(defaultStream::error_stream(),
|
|
||||||
"Unrecognized %s%soption: %s\n", option_type, spacer,
|
|
||||||
option->optionString);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char* user_assertion_options[] = {
|
static const char* user_assertion_options[] = {
|
||||||
|
@ -802,9 +802,6 @@ class os: AllStatic {
|
|||||||
// System loadavg support. Returns -1 if load average cannot be obtained.
|
// System loadavg support. Returns -1 if load average cannot be obtained.
|
||||||
static int loadavg(double loadavg[], int nelem);
|
static int loadavg(double loadavg[], int nelem);
|
||||||
|
|
||||||
// Hook for os specific jvm options that we don't want to abort on seeing
|
|
||||||
static bool obsolete_option(const JavaVMOption *option);
|
|
||||||
|
|
||||||
// Amount beyond the callee frame size that we bang the stack.
|
// Amount beyond the callee frame size that we bang the stack.
|
||||||
static int extra_bang_size_in_bytes();
|
static int extra_bang_size_in_bytes();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user