--- a/src/hotspot/share/runtime/arguments.cpp Mon Aug 26 09:13:38 2019 +0200
+++ b/src/hotspot/share/runtime/arguments.cpp Mon Aug 26 09:15:43 2019 +0200
@@ -750,7 +750,7 @@
// if flag has become obsolete it should not have a "globals" flag defined anymore.
if (!version_less_than(JDK_Version::current(), flag.obsolete_in)) {
- if (JVMFlag::find_flag(flag.name) != NULL) {
+ if (JVMFlag::find_declared_flag(flag.name) != NULL) {
// Temporarily disable the warning: 8196739
// warning("Global variable for obsolete special flag entry \"%s\" should be removed", flag.name);
}
@@ -760,7 +760,7 @@
if (!flag.expired_in.is_undefined()) {
// if flag has become expired it should not have a "globals" flag defined anymore.
if (!version_less_than(JDK_Version::current(), flag.expired_in)) {
- if (JVMFlag::find_flag(flag.name) != NULL) {
+ if (JVMFlag::find_declared_flag(flag.name) != NULL) {
// Temporarily disable the warning: 8196739
// warning("Global variable for expired flag entry \"%s\" should be removed", flag.name);
}
@@ -844,15 +844,15 @@
}
}
-static bool set_bool_flag(const char* name, bool value, JVMFlag::Flags origin) {
- if (JVMFlag::boolAtPut(name, &value, origin) == JVMFlag::SUCCESS) {
+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;
}
}
-static bool set_fp_numeric_flag(const char* name, char* value, JVMFlag::Flags origin) {
+static bool set_fp_numeric_flag(JVMFlag* flag, char* value, JVMFlag::Flags origin) {
char* end;
errno = 0;
double v = strtod(value, &end);
@@ -860,26 +860,25 @@
return false;
}
- if (JVMFlag::doubleAtPut(name, &v, origin) == JVMFlag::SUCCESS) {
+ if (JVMFlag::doubleAtPut(flag, &v, origin) == JVMFlag::SUCCESS) {
return true;
}
return false;
}
-static bool set_numeric_flag(const char* name, char* value, JVMFlag::Flags origin) {
+static bool set_numeric_flag(JVMFlag* flag, char* value, JVMFlag::Flags origin) {
julong v;
int int_v;
intx intx_v;
bool is_neg = false;
- JVMFlag* result = JVMFlag::find_flag(name, strlen(name));
-
- if (result == NULL) {
+
+ if (flag == NULL) {
return false;
}
// Check the sign first since atojulong() parses only unsigned values.
if (*value == '-') {
- if (!result->is_intx() && !result->is_int()) {
+ if (!flag->is_intx() && !flag->is_int()) {
return false;
}
value++;
@@ -888,48 +887,48 @@
if (!Arguments::atojulong(value, &v)) {
return false;
}
- if (result->is_int()) {
+ if (flag->is_int()) {
int_v = (int) v;
if (is_neg) {
int_v = -int_v;
}
- return JVMFlag::intAtPut(result, &int_v, origin) == JVMFlag::SUCCESS;
- } else if (result->is_uint()) {
+ return JVMFlag::intAtPut(flag, &int_v, origin) == JVMFlag::SUCCESS;
+ } else if (flag->is_uint()) {
uint uint_v = (uint) v;
- return JVMFlag::uintAtPut(result, &uint_v, origin) == JVMFlag::SUCCESS;
- } else if (result->is_intx()) {
+ 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(result, &intx_v, origin) == JVMFlag::SUCCESS;
- } else if (result->is_uintx()) {
+ return JVMFlag::intxAtPut(flag, &intx_v, origin) == JVMFlag::SUCCESS;
+ } else if (flag->is_uintx()) {
uintx uintx_v = (uintx) v;
- return JVMFlag::uintxAtPut(result, &uintx_v, origin) == JVMFlag::SUCCESS;
- } else if (result->is_uint64_t()) {
+ 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(result, &uint64_t_v, origin) == JVMFlag::SUCCESS;
- } else if (result->is_size_t()) {
+ 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(result, &size_t_v, origin) == JVMFlag::SUCCESS;
- } else if (result->is_double()) {
+ return JVMFlag::size_tAtPut(flag, &size_t_v, origin) == JVMFlag::SUCCESS;
+ } else if (flag->is_double()) {
double double_v = (double) v;
- return JVMFlag::doubleAtPut(result, &double_v, origin) == JVMFlag::SUCCESS;
+ return JVMFlag::doubleAtPut(flag, &double_v, origin) == JVMFlag::SUCCESS;
} else {
return false;
}
}
-static bool set_string_flag(const char* name, const char* value, JVMFlag::Flags origin) {
- if (JVMFlag::ccstrAtPut(name, &value, origin) != JVMFlag::SUCCESS) return false;
+static bool set_string_flag(JVMFlag* flag, const char* value, JVMFlag::Flags origin) {
+ if (JVMFlag::ccstrAtPut(flag, &value, origin) != JVMFlag::SUCCESS) return false;
// Contract: JVMFlag always returns a pointer that needs freeing.
FREE_C_HEAP_ARRAY(char, value);
return true;
}
-static bool append_to_string_flag(const char* name, const char* new_value, JVMFlag::Flags origin) {
+static bool append_to_string_flag(JVMFlag* flag, const char* new_value, JVMFlag::Flags origin) {
const char* old_value = "";
- if (JVMFlag::ccstrAt(name, &old_value) != JVMFlag::SUCCESS) return false;
+ if (JVMFlag::ccstrAt(flag, &old_value) != JVMFlag::SUCCESS) return false;
size_t old_len = old_value != NULL ? strlen(old_value) : 0;
size_t new_len = strlen(new_value);
const char* value;
@@ -946,7 +945,7 @@
value = buf;
free_this_too = buf;
}
- (void) JVMFlag::ccstrAtPut(name, &value, origin);
+ (void) JVMFlag::ccstrAtPut(flag, &value, origin);
// JVMFlag always returns a pointer that needs freeing.
FREE_C_HEAP_ARRAY(char, value);
if (free_this_too != NULL) {
@@ -1041,7 +1040,8 @@
if (real_name == NULL) {
return false;
}
- return set_bool_flag(real_name, false, origin);
+ JVMFlag* flag = JVMFlag::find_flag(real_name);
+ return set_bool_flag(flag, false, origin);
}
if (sscanf(arg, "+%" XSTR(BUFLEN) NAME_RANGE "%c", name, &dummy) == 1) {
AliasedLoggingFlag alf = catch_logging_aliases(name, true);
@@ -1053,13 +1053,13 @@
if (real_name == NULL) {
return false;
}
- return set_bool_flag(real_name, true, origin);
+ JVMFlag* flag = JVMFlag::find_flag(real_name);
+ return set_bool_flag(flag, true, origin);
}
char punct;
if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "%c", name, &punct) == 2 && punct == '=') {
const char* value = strchr(arg, '=') + 1;
- JVMFlag* flag;
// this scanf pattern matches both strings (handled here) and numbers (handled later))
AliasedLoggingFlag alf = catch_logging_aliases(name, true);
@@ -1071,15 +1071,15 @@
if (real_name == NULL) {
return false;
}
- flag = JVMFlag::find_flag(real_name);
+ JVMFlag* flag = JVMFlag::find_flag(real_name);
if (flag != NULL && flag->is_ccstr()) {
if (flag->ccstr_accumulates()) {
- return append_to_string_flag(real_name, value, origin);
+ return append_to_string_flag(flag, value, origin);
} else {
if (value[0] == '\0') {
value = NULL;
}
- return set_string_flag(real_name, value, origin);
+ return set_string_flag(flag, value, origin);
}
} else {
warn_if_deprecated = false; // if arg is deprecated, we've already done warning...
@@ -1096,7 +1096,8 @@
if (real_name == NULL) {
return false;
}
- return set_string_flag(real_name, value, origin);
+ JVMFlag* flag = JVMFlag::find_flag(real_name);
+ return set_string_flag(flag, value, origin);
}
#define SIGNED_FP_NUMBER_RANGE "[-0123456789.eE+]"
@@ -1111,7 +1112,8 @@
if (real_name == NULL) {
return false;
}
- return set_fp_numeric_flag(real_name, value, origin);
+ JVMFlag* flag = JVMFlag::find_flag(real_name);
+ return set_fp_numeric_flag(flag, value, origin);
}
}
@@ -1121,7 +1123,8 @@
if (real_name == NULL) {
return false;
}
- return set_numeric_flag(real_name, value, origin);
+ JVMFlag* flag = JVMFlag::find_flag(real_name);
+ return set_numeric_flag(flag, value, origin);
}
return false;
@@ -1277,7 +1280,7 @@
// For locked flags, report a custom error message if available.
// Otherwise, report the standard unrecognized VM option.
- JVMFlag* found_flag = JVMFlag::find_flag((const char*)argname, arg_len, true, true);
+ const JVMFlag* found_flag = JVMFlag::find_declared_flag((const char*)argname, arg_len);
if (found_flag != NULL) {
char locked_message_buf[BUFLEN];
JVMFlag::MsgType msg_type = found_flag->get_locked_message(locked_message_buf, BUFLEN);