mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 19:14:38 +02:00
8024545: make develop and notproduct flag values available in product builds
Reviewed-by: dholmes, kvn
This commit is contained in:
Christian Thalinger
parent
0ccb2841ea
commit
cd7bfac363
13 changed files with 583 additions and 408 deletions
|
|
@ -62,26 +62,174 @@ ARCH_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PRODUCT_FLAG, \
|
|||
MATERIALIZE_FLAGS_EXT
|
||||
|
||||
|
||||
void Flag::check_writable() {
|
||||
if (is_constant_in_binary()) {
|
||||
fatal(err_msg("flag is constant: %s", _name));
|
||||
}
|
||||
}
|
||||
|
||||
bool Flag::is_bool() const {
|
||||
return strcmp(_type, "bool") == 0;
|
||||
}
|
||||
|
||||
bool Flag::get_bool() const {
|
||||
return *((bool*) _addr);
|
||||
}
|
||||
|
||||
void Flag::set_bool(bool value) {
|
||||
check_writable();
|
||||
*((bool*) _addr) = value;
|
||||
}
|
||||
|
||||
bool Flag::is_intx() const {
|
||||
return strcmp(_type, "intx") == 0;
|
||||
}
|
||||
|
||||
intx Flag::get_intx() const {
|
||||
return *((intx*) _addr);
|
||||
}
|
||||
|
||||
void Flag::set_intx(intx value) {
|
||||
check_writable();
|
||||
*((intx*) _addr) = value;
|
||||
}
|
||||
|
||||
bool Flag::is_uintx() const {
|
||||
return strcmp(_type, "uintx") == 0;
|
||||
}
|
||||
|
||||
uintx Flag::get_uintx() const {
|
||||
return *((uintx*) _addr);
|
||||
}
|
||||
|
||||
void Flag::set_uintx(uintx value) {
|
||||
check_writable();
|
||||
*((uintx*) _addr) = value;
|
||||
}
|
||||
|
||||
bool Flag::is_uint64_t() const {
|
||||
return strcmp(_type, "uint64_t") == 0;
|
||||
}
|
||||
|
||||
uint64_t Flag::get_uint64_t() const {
|
||||
return *((uint64_t*) _addr);
|
||||
}
|
||||
|
||||
void Flag::set_uint64_t(uint64_t value) {
|
||||
check_writable();
|
||||
*((uint64_t*) _addr) = value;
|
||||
}
|
||||
|
||||
bool Flag::is_double() const {
|
||||
return strcmp(_type, "double") == 0;
|
||||
}
|
||||
|
||||
double Flag::get_double() const {
|
||||
return *((double*) _addr);
|
||||
}
|
||||
|
||||
void Flag::set_double(double value) {
|
||||
check_writable();
|
||||
*((double*) _addr) = value;
|
||||
}
|
||||
|
||||
bool Flag::is_ccstr() const {
|
||||
return strcmp(_type, "ccstr") == 0 || strcmp(_type, "ccstrlist") == 0;
|
||||
}
|
||||
|
||||
bool Flag::ccstr_accumulates() const {
|
||||
return strcmp(_type, "ccstrlist") == 0;
|
||||
}
|
||||
|
||||
ccstr Flag::get_ccstr() const {
|
||||
return *((ccstr*) _addr);
|
||||
}
|
||||
|
||||
void Flag::set_ccstr(ccstr value) {
|
||||
check_writable();
|
||||
*((ccstr*) _addr) = value;
|
||||
}
|
||||
|
||||
|
||||
Flag::Flags Flag::get_origin() {
|
||||
return Flags(_flags & VALUE_ORIGIN_MASK);
|
||||
}
|
||||
|
||||
void Flag::set_origin(Flags origin) {
|
||||
assert((origin & VALUE_ORIGIN_MASK) == origin, "sanity");
|
||||
_flags = Flags((_flags & ~VALUE_ORIGIN_MASK) | origin);
|
||||
}
|
||||
|
||||
bool Flag::is_default() {
|
||||
return (get_origin() == DEFAULT);
|
||||
}
|
||||
|
||||
bool Flag::is_ergonomic() {
|
||||
return (get_origin() == ERGONOMIC);
|
||||
}
|
||||
|
||||
bool Flag::is_command_line() {
|
||||
return (get_origin() == COMMAND_LINE);
|
||||
}
|
||||
|
||||
bool Flag::is_product() const {
|
||||
return (_flags & KIND_PRODUCT) != 0;
|
||||
}
|
||||
|
||||
bool Flag::is_manageable() const {
|
||||
return (_flags & KIND_MANAGEABLE) != 0;
|
||||
}
|
||||
|
||||
bool Flag::is_diagnostic() const {
|
||||
return (_flags & KIND_DIAGNOSTIC) != 0;
|
||||
}
|
||||
|
||||
bool Flag::is_experimental() const {
|
||||
return (_flags & KIND_EXPERIMENTAL) != 0;
|
||||
}
|
||||
|
||||
bool Flag::is_notproduct() const {
|
||||
return (_flags & KIND_NOT_PRODUCT) != 0;
|
||||
}
|
||||
|
||||
bool Flag::is_develop() const {
|
||||
return (_flags & KIND_DEVELOP) != 0;
|
||||
}
|
||||
|
||||
bool Flag::is_read_write() const {
|
||||
return (_flags & KIND_READ_WRITE) != 0;
|
||||
}
|
||||
|
||||
bool Flag::is_commercial() const {
|
||||
return (_flags & KIND_COMMERCIAL) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns if this flag is a constant in the binary. Right now this is
|
||||
* true for notproduct and develop flags in product builds.
|
||||
*/
|
||||
bool Flag::is_constant_in_binary() const {
|
||||
#ifdef PRODUCT
|
||||
return is_notproduct() || is_develop();
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool Flag::is_unlocker() const {
|
||||
return strcmp(name, "UnlockDiagnosticVMOptions") == 0 ||
|
||||
strcmp(name, "UnlockExperimentalVMOptions") == 0 ||
|
||||
return strcmp(_name, "UnlockDiagnosticVMOptions") == 0 ||
|
||||
strcmp(_name, "UnlockExperimentalVMOptions") == 0 ||
|
||||
is_unlocker_ext();
|
||||
}
|
||||
|
||||
bool Flag::is_unlocked() const {
|
||||
if (strcmp(kind, "{diagnostic}") == 0 ||
|
||||
strcmp(kind, "{C2 diagnostic}") == 0 ||
|
||||
strcmp(kind, "{ARCH diagnostic}") == 0 ||
|
||||
strcmp(kind, "{Shark diagnostic}") == 0) {
|
||||
if (is_diagnostic()) {
|
||||
return UnlockDiagnosticVMOptions;
|
||||
} else if (strcmp(kind, "{experimental}") == 0 ||
|
||||
strcmp(kind, "{C2 experimental}") == 0 ||
|
||||
strcmp(kind, "{ARCH experimental}") == 0 ||
|
||||
strcmp(kind, "{Shark experimental}") == 0) {
|
||||
return UnlockExperimentalVMOptions;
|
||||
} else {
|
||||
return is_unlocked_ext();
|
||||
}
|
||||
if (is_experimental()) {
|
||||
return UnlockExperimentalVMOptions;
|
||||
}
|
||||
return is_unlocked_ext();
|
||||
}
|
||||
|
||||
// Get custom message for this locked flag, or return NULL if
|
||||
|
|
@ -91,16 +239,14 @@ void Flag::get_locked_message(char* buf, int buflen) const {
|
|||
}
|
||||
|
||||
bool Flag::is_writeable() const {
|
||||
return strcmp(kind, "{manageable}") == 0 ||
|
||||
strcmp(kind, "{product rw}") == 0 ||
|
||||
is_writeable_ext();
|
||||
return is_manageable() || (is_product() && is_read_write()) || is_writeable_ext();
|
||||
}
|
||||
|
||||
// All flags except "manageable" are assumed to be internal flags.
|
||||
// Long term, we need to define a mechanism to specify which flags
|
||||
// are external/stable and change this function accordingly.
|
||||
bool Flag::is_external() const {
|
||||
return strcmp(kind, "{manageable}") == 0 || is_external_ext();
|
||||
return is_manageable() || is_external_ext();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -108,53 +254,113 @@ bool Flag::is_external() const {
|
|||
#define FORMAT_BUFFER_LEN 16
|
||||
|
||||
void Flag::print_on(outputStream* st, bool withComments) {
|
||||
st->print("%9s %-40s %c= ", type, name, (origin != DEFAULT ? ':' : ' '));
|
||||
if (is_bool()) st->print("%-16s", get_bool() ? "true" : "false");
|
||||
if (is_intx()) st->print("%-16ld", get_intx());
|
||||
if (is_uintx()) st->print("%-16lu", get_uintx());
|
||||
if (is_uint64_t()) st->print("%-16lu", get_uint64_t());
|
||||
if (is_double()) st->print("%-16f", get_double());
|
||||
|
||||
if (is_ccstr()) {
|
||||
const char* cp = get_ccstr();
|
||||
if (cp != NULL) {
|
||||
const char* eol;
|
||||
while ((eol = strchr(cp, '\n')) != NULL) {
|
||||
char format_buffer[FORMAT_BUFFER_LEN];
|
||||
size_t llen = pointer_delta(eol, cp, sizeof(char));
|
||||
jio_snprintf(format_buffer, FORMAT_BUFFER_LEN,
|
||||
"%%." SIZE_FORMAT "s", llen);
|
||||
st->print(format_buffer, cp);
|
||||
st->cr();
|
||||
cp = eol+1;
|
||||
st->print("%5s %-35s += ", "", name);
|
||||
}
|
||||
st->print("%-16s", cp);
|
||||
}
|
||||
else st->print("%-16s", "");
|
||||
// Don't print notproduct and develop flags in a product build.
|
||||
if (is_constant_in_binary()) {
|
||||
return;
|
||||
}
|
||||
st->print("%-20s", kind);
|
||||
|
||||
st->print("%9s %-40s %c= ", _type, _name, (!is_default() ? ':' : ' '));
|
||||
|
||||
if (is_bool()) {
|
||||
st->print("%-16s", get_bool() ? "true" : "false");
|
||||
}
|
||||
if (is_intx()) {
|
||||
st->print("%-16ld", get_intx());
|
||||
}
|
||||
if (is_uintx()) {
|
||||
st->print("%-16lu", get_uintx());
|
||||
}
|
||||
if (is_uint64_t()) {
|
||||
st->print("%-16lu", get_uint64_t());
|
||||
}
|
||||
if (is_double()) {
|
||||
st->print("%-16f", get_double());
|
||||
}
|
||||
if (is_ccstr()) {
|
||||
const char* cp = get_ccstr();
|
||||
if (cp != NULL) {
|
||||
const char* eol;
|
||||
while ((eol = strchr(cp, '\n')) != NULL) {
|
||||
char format_buffer[FORMAT_BUFFER_LEN];
|
||||
size_t llen = pointer_delta(eol, cp, sizeof(char));
|
||||
jio_snprintf(format_buffer, FORMAT_BUFFER_LEN,
|
||||
"%%." SIZE_FORMAT "s", llen);
|
||||
st->print(format_buffer, cp);
|
||||
st->cr();
|
||||
cp = eol+1;
|
||||
st->print("%5s %-35s += ", "", _name);
|
||||
}
|
||||
st->print("%-16s", cp);
|
||||
}
|
||||
else st->print("%-16s", "");
|
||||
}
|
||||
|
||||
st->print("%-20");
|
||||
print_kind(st);
|
||||
|
||||
if (withComments) {
|
||||
#ifndef PRODUCT
|
||||
st->print("%s", doc );
|
||||
st->print("%s", _doc);
|
||||
#endif
|
||||
}
|
||||
st->cr();
|
||||
}
|
||||
|
||||
void Flag::print_kind(outputStream* st) {
|
||||
struct Data {
|
||||
int flag;
|
||||
const char* name;
|
||||
};
|
||||
|
||||
Data data[] = {
|
||||
{ KIND_C1, "C1" },
|
||||
{ KIND_C2, "C2" },
|
||||
{ KIND_ARCH, "ARCH" },
|
||||
{ KIND_SHARK, "SHARK" },
|
||||
{ KIND_PLATFORM_DEPENDENT, "pd" },
|
||||
{ KIND_PRODUCT, "product" },
|
||||
{ KIND_MANAGEABLE, "manageable" },
|
||||
{ KIND_DIAGNOSTIC, "diagnostic" },
|
||||
{ KIND_NOT_PRODUCT, "notproduct" },
|
||||
{ KIND_DEVELOP, "develop" },
|
||||
{ KIND_LP64_PRODUCT, "lp64_product" },
|
||||
{ KIND_READ_WRITE, "rw" },
|
||||
{ -1, "" }
|
||||
};
|
||||
|
||||
if ((_flags & KIND_MASK) != 0) {
|
||||
st->print("{");
|
||||
bool is_first = true;
|
||||
|
||||
for (int i = 0; data[i].flag != -1; i++) {
|
||||
Data d = data[i];
|
||||
if ((_flags & d.flag) != 0) {
|
||||
if (is_first) {
|
||||
is_first = false;
|
||||
} else {
|
||||
st->print(" ");
|
||||
}
|
||||
st->print(d.name);
|
||||
}
|
||||
}
|
||||
|
||||
st->print("}");
|
||||
}
|
||||
}
|
||||
|
||||
void Flag::print_as_flag(outputStream* st) {
|
||||
if (is_bool()) {
|
||||
st->print("-XX:%s%s", get_bool() ? "+" : "-", name);
|
||||
st->print("-XX:%s%s", get_bool() ? "+" : "-", _name);
|
||||
} else if (is_intx()) {
|
||||
st->print("-XX:%s=" INTX_FORMAT, name, get_intx());
|
||||
st->print("-XX:%s=" INTX_FORMAT, _name, get_intx());
|
||||
} else if (is_uintx()) {
|
||||
st->print("-XX:%s=" UINTX_FORMAT, name, get_uintx());
|
||||
st->print("-XX:%s=" UINTX_FORMAT, _name, get_uintx());
|
||||
} else if (is_uint64_t()) {
|
||||
st->print("-XX:%s=" UINT64_FORMAT, name, get_uint64_t());
|
||||
st->print("-XX:%s=" UINT64_FORMAT, _name, get_uint64_t());
|
||||
} else if (is_double()) {
|
||||
st->print("-XX:%s=%f", name, get_double());
|
||||
st->print("-XX:%s=%f", _name, get_double());
|
||||
} else if (is_ccstr()) {
|
||||
st->print("-XX:%s=", name);
|
||||
st->print("-XX:%s=", _name);
|
||||
const char* cp = get_ccstr();
|
||||
if (cp != NULL) {
|
||||
// Need to turn embedded '\n's back into separate arguments
|
||||
|
|
@ -167,7 +373,7 @@ void Flag::print_as_flag(outputStream* st) {
|
|||
st->print("%c", *cp);
|
||||
break;
|
||||
case '\n':
|
||||
st->print(" -XX:%s=", name);
|
||||
st->print(" -XX:%s=", _name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -180,79 +386,51 @@ void Flag::print_as_flag(outputStream* st) {
|
|||
// 4991491 do not "optimize out" the was_set false values: omitting them
|
||||
// tickles a Microsoft compiler bug causing flagTable to be malformed
|
||||
|
||||
#define RUNTIME_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product}", DEFAULT },
|
||||
#define RUNTIME_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{pd product}", DEFAULT },
|
||||
#define RUNTIME_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{diagnostic}", DEFAULT },
|
||||
#define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{experimental}", DEFAULT },
|
||||
#define RUNTIME_MANAGEABLE_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{manageable}", DEFAULT },
|
||||
#define RUNTIME_PRODUCT_RW_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product rw}", DEFAULT },
|
||||
#define NAME(name) NOT_PRODUCT(&name) PRODUCT_ONLY(&CONST_##name)
|
||||
|
||||
#ifdef PRODUCT
|
||||
#define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "", DEFAULT },
|
||||
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{pd}", DEFAULT },
|
||||
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{notproduct}", DEFAULT },
|
||||
#endif
|
||||
#define RUNTIME_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_PRODUCT) },
|
||||
#define RUNTIME_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define RUNTIME_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DIAGNOSTIC) },
|
||||
#define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_EXPERIMENTAL) },
|
||||
#define RUNTIME_MANAGEABLE_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_MANAGEABLE) },
|
||||
#define RUNTIME_PRODUCT_RW_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_PRODUCT | Flag::KIND_READ_WRITE) },
|
||||
#define RUNTIME_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DEVELOP) },
|
||||
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_NOT_PRODUCT) },
|
||||
|
||||
#ifdef _LP64
|
||||
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{lp64_product}", DEFAULT },
|
||||
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_LP64_PRODUCT) },
|
||||
#else
|
||||
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#endif // _LP64
|
||||
|
||||
#define C1_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 product}", DEFAULT },
|
||||
#define C1_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 pd product}", DEFAULT },
|
||||
#define C1_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 diagnostic}", DEFAULT },
|
||||
#ifdef PRODUCT
|
||||
#define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1}", DEFAULT },
|
||||
#define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C1 pd}", DEFAULT },
|
||||
#define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1 notproduct}", DEFAULT },
|
||||
#endif
|
||||
#define C1_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_PRODUCT) },
|
||||
#define C1_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define C1_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_DIAGNOSTIC) },
|
||||
#define C1_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_DEVELOP) },
|
||||
#define C1_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define C1_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_NOT_PRODUCT) },
|
||||
|
||||
#define C2_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 product}", DEFAULT },
|
||||
#define C2_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 pd product}", DEFAULT },
|
||||
#define C2_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 diagnostic}", DEFAULT },
|
||||
#define C2_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 experimental}", DEFAULT },
|
||||
#ifdef PRODUCT
|
||||
#define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2}", DEFAULT },
|
||||
#define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C2 pd}", DEFAULT },
|
||||
#define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2 notproduct}", DEFAULT },
|
||||
#endif
|
||||
#define C2_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_PRODUCT) },
|
||||
#define C2_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define C2_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_DIAGNOSTIC) },
|
||||
#define C2_EXPERIMENTAL_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_EXPERIMENTAL) },
|
||||
#define C2_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_DEVELOP) },
|
||||
#define C2_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define C2_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_NOT_PRODUCT) },
|
||||
|
||||
#define ARCH_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{ARCH product}", DEFAULT },
|
||||
#define ARCH_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{ARCH diagnostic}", DEFAULT },
|
||||
#define ARCH_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{ARCH experimental}", DEFAULT },
|
||||
#ifdef PRODUCT
|
||||
#define ARCH_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define ARCH_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define ARCH_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{ARCH}", DEFAULT },
|
||||
#define ARCH_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{ARCH notproduct}", DEFAULT },
|
||||
#endif
|
||||
#define ARCH_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_PRODUCT) },
|
||||
#define ARCH_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_DIAGNOSTIC) },
|
||||
#define ARCH_EXPERIMENTAL_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_EXPERIMENTAL) },
|
||||
#define ARCH_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_DEVELOP) },
|
||||
#define ARCH_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_NOT_PRODUCT) },
|
||||
|
||||
#define SHARK_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark product}", DEFAULT },
|
||||
#define SHARK_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark pd product}", DEFAULT },
|
||||
#define SHARK_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark diagnostic}", DEFAULT },
|
||||
#ifdef PRODUCT
|
||||
#define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark}", DEFAULT },
|
||||
#define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{Shark pd}", DEFAULT },
|
||||
#define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark notproduct}", DEFAULT },
|
||||
#endif
|
||||
#define SHARK_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_PRODUCT) },
|
||||
#define SHARK_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define SHARK_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_DIAGNOSTIC) },
|
||||
#define SHARK_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_DEVELOP) },
|
||||
#define SHARK_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
|
||||
#define SHARK_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_NOT_PRODUCT) },
|
||||
|
||||
static Flag flagTable[] = {
|
||||
RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT)
|
||||
|
|
@ -285,9 +463,14 @@ inline bool str_equal(const char* s, const char* q, size_t len) {
|
|||
|
||||
// Search the flag table for a named flag
|
||||
Flag* Flag::find_flag(const char* name, size_t length, bool allow_locked) {
|
||||
for (Flag* current = &flagTable[0]; current->name != NULL; current++) {
|
||||
if (str_equal(current->name, name, length)) {
|
||||
// Found a matching entry. Report locked flags only if allowed.
|
||||
for (Flag* current = &flagTable[0]; current->_name != NULL; current++) {
|
||||
if (str_equal(current->_name, name, length)) {
|
||||
// Found a matching entry.
|
||||
// Don't report notproduct and develop flags in product builds.
|
||||
if (current->is_constant_in_binary()) {
|
||||
return NULL;
|
||||
}
|
||||
// Report locked flags only if allowed.
|
||||
if (!(current->is_unlocked() || current->is_unlocker())) {
|
||||
if (!allow_locked) {
|
||||
// disable use of locked flags, e.g. diagnostic, experimental,
|
||||
|
|
@ -327,8 +510,8 @@ Flag* Flag::fuzzy_match(const char* name, size_t length, bool allow_locked) {
|
|||
float score;
|
||||
float max_score = -1;
|
||||
|
||||
for (Flag* current = &flagTable[0]; current->name != NULL; current++) {
|
||||
score = str_similar(current->name, name, length);
|
||||
for (Flag* current = &flagTable[0]; current->_name != NULL; current++) {
|
||||
score = str_similar(current->_name, name, length);
|
||||
if (score > max_score) {
|
||||
max_score = score;
|
||||
match = current;
|
||||
|
|
@ -357,25 +540,25 @@ static Flag* address_of_flag(CommandLineFlagWithType flag) {
|
|||
bool CommandLineFlagsEx::is_default(CommandLineFlag flag) {
|
||||
assert((size_t)flag < Flag::numFlags, "bad command line flag index");
|
||||
Flag* f = &Flag::flags[flag];
|
||||
return (f->origin == DEFAULT);
|
||||
return f->is_default();
|
||||
}
|
||||
|
||||
bool CommandLineFlagsEx::is_ergo(CommandLineFlag flag) {
|
||||
assert((size_t)flag < Flag::numFlags, "bad command line flag index");
|
||||
Flag* f = &Flag::flags[flag];
|
||||
return (f->origin == ERGONOMIC);
|
||||
return f->is_ergonomic();
|
||||
}
|
||||
|
||||
bool CommandLineFlagsEx::is_cmdline(CommandLineFlag flag) {
|
||||
assert((size_t)flag < Flag::numFlags, "bad command line flag index");
|
||||
Flag* f = &Flag::flags[flag];
|
||||
return (f->origin == COMMAND_LINE);
|
||||
return f->is_command_line();
|
||||
}
|
||||
|
||||
bool CommandLineFlags::wasSetOnCmdline(const char* name, bool* value) {
|
||||
Flag* result = Flag::find_flag((char*)name, strlen(name));
|
||||
if (result == NULL) return false;
|
||||
*value = (result->origin == COMMAND_LINE);
|
||||
*value = result->is_command_line();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -387,22 +570,22 @@ bool CommandLineFlags::boolAt(char* name, size_t len, bool* value) {
|
|||
return true;
|
||||
}
|
||||
|
||||
bool CommandLineFlags::boolAtPut(char* name, size_t len, bool* value, FlagValueOrigin origin) {
|
||||
bool CommandLineFlags::boolAtPut(char* name, size_t len, bool* value, Flag::Flags origin) {
|
||||
Flag* result = Flag::find_flag(name, len);
|
||||
if (result == NULL) return false;
|
||||
if (!result->is_bool()) return false;
|
||||
bool old_value = result->get_bool();
|
||||
result->set_bool(*value);
|
||||
*value = old_value;
|
||||
result->origin = origin;
|
||||
result->set_origin(origin);
|
||||
return true;
|
||||
}
|
||||
|
||||
void CommandLineFlagsEx::boolAtPut(CommandLineFlagWithType flag, bool value, FlagValueOrigin origin) {
|
||||
void CommandLineFlagsEx::boolAtPut(CommandLineFlagWithType flag, bool value, Flag::Flags origin) {
|
||||
Flag* faddr = address_of_flag(flag);
|
||||
guarantee(faddr != NULL && faddr->is_bool(), "wrong flag type");
|
||||
faddr->set_bool(value);
|
||||
faddr->origin = origin;
|
||||
faddr->set_origin(origin);
|
||||
}
|
||||
|
||||
bool CommandLineFlags::intxAt(char* name, size_t len, intx* value) {
|
||||
|
|
@ -413,22 +596,22 @@ bool CommandLineFlags::intxAt(char* name, size_t len, intx* value) {
|
|||
return true;
|
||||
}
|
||||
|
||||
bool CommandLineFlags::intxAtPut(char* name, size_t len, intx* value, FlagValueOrigin origin) {
|
||||
bool CommandLineFlags::intxAtPut(char* name, size_t len, intx* value, Flag::Flags origin) {
|
||||
Flag* result = Flag::find_flag(name, len);
|
||||
if (result == NULL) return false;
|
||||
if (!result->is_intx()) return false;
|
||||
intx old_value = result->get_intx();
|
||||
result->set_intx(*value);
|
||||
*value = old_value;
|
||||
result->origin = origin;
|
||||
result->set_origin(origin);
|
||||
return true;
|
||||
}
|
||||
|
||||
void CommandLineFlagsEx::intxAtPut(CommandLineFlagWithType flag, intx value, FlagValueOrigin origin) {
|
||||
void CommandLineFlagsEx::intxAtPut(CommandLineFlagWithType flag, intx value, Flag::Flags origin) {
|
||||
Flag* faddr = address_of_flag(flag);
|
||||
guarantee(faddr != NULL && faddr->is_intx(), "wrong flag type");
|
||||
faddr->set_intx(value);
|
||||
faddr->origin = origin;
|
||||
faddr->set_origin(origin);
|
||||
}
|
||||
|
||||
bool CommandLineFlags::uintxAt(char* name, size_t len, uintx* value) {
|
||||
|
|
@ -439,22 +622,22 @@ bool CommandLineFlags::uintxAt(char* name, size_t len, uintx* value) {
|
|||
return true;
|
||||
}
|
||||
|
||||
bool CommandLineFlags::uintxAtPut(char* name, size_t len, uintx* value, FlagValueOrigin origin) {
|
||||
bool CommandLineFlags::uintxAtPut(char* name, size_t len, uintx* value, Flag::Flags origin) {
|
||||
Flag* result = Flag::find_flag(name, len);
|
||||
if (result == NULL) return false;
|
||||
if (!result->is_uintx()) return false;
|
||||
uintx old_value = result->get_uintx();
|
||||
result->set_uintx(*value);
|
||||
*value = old_value;
|
||||
result->origin = origin;
|
||||
result->set_origin(origin);
|
||||
return true;
|
||||
}
|
||||
|
||||
void CommandLineFlagsEx::uintxAtPut(CommandLineFlagWithType flag, uintx value, FlagValueOrigin origin) {
|
||||
void CommandLineFlagsEx::uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin) {
|
||||
Flag* faddr = address_of_flag(flag);
|
||||
guarantee(faddr != NULL && faddr->is_uintx(), "wrong flag type");
|
||||
faddr->set_uintx(value);
|
||||
faddr->origin = origin;
|
||||
faddr->set_origin(origin);
|
||||
}
|
||||
|
||||
bool CommandLineFlags::uint64_tAt(char* name, size_t len, uint64_t* value) {
|
||||
|
|
@ -465,22 +648,22 @@ bool CommandLineFlags::uint64_tAt(char* name, size_t len, uint64_t* value) {
|
|||
return true;
|
||||
}
|
||||
|
||||
bool CommandLineFlags::uint64_tAtPut(char* name, size_t len, uint64_t* value, FlagValueOrigin origin) {
|
||||
bool CommandLineFlags::uint64_tAtPut(char* name, size_t len, uint64_t* value, Flag::Flags origin) {
|
||||
Flag* result = Flag::find_flag(name, len);
|
||||
if (result == NULL) return false;
|
||||
if (!result->is_uint64_t()) return false;
|
||||
uint64_t old_value = result->get_uint64_t();
|
||||
result->set_uint64_t(*value);
|
||||
*value = old_value;
|
||||
result->origin = origin;
|
||||
result->set_origin(origin);
|
||||
return true;
|
||||
}
|
||||
|
||||
void CommandLineFlagsEx::uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, FlagValueOrigin origin) {
|
||||
void CommandLineFlagsEx::uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin) {
|
||||
Flag* faddr = address_of_flag(flag);
|
||||
guarantee(faddr != NULL && faddr->is_uint64_t(), "wrong flag type");
|
||||
faddr->set_uint64_t(value);
|
||||
faddr->origin = origin;
|
||||
faddr->set_origin(origin);
|
||||
}
|
||||
|
||||
bool CommandLineFlags::doubleAt(char* name, size_t len, double* value) {
|
||||
|
|
@ -491,22 +674,22 @@ bool CommandLineFlags::doubleAt(char* name, size_t len, double* value) {
|
|||
return true;
|
||||
}
|
||||
|
||||
bool CommandLineFlags::doubleAtPut(char* name, size_t len, double* value, FlagValueOrigin origin) {
|
||||
bool CommandLineFlags::doubleAtPut(char* name, size_t len, double* value, Flag::Flags origin) {
|
||||
Flag* result = Flag::find_flag(name, len);
|
||||
if (result == NULL) return false;
|
||||
if (!result->is_double()) return false;
|
||||
double old_value = result->get_double();
|
||||
result->set_double(*value);
|
||||
*value = old_value;
|
||||
result->origin = origin;
|
||||
result->set_origin(origin);
|
||||
return true;
|
||||
}
|
||||
|
||||
void CommandLineFlagsEx::doubleAtPut(CommandLineFlagWithType flag, double value, FlagValueOrigin origin) {
|
||||
void CommandLineFlagsEx::doubleAtPut(CommandLineFlagWithType flag, double value, Flag::Flags origin) {
|
||||
Flag* faddr = address_of_flag(flag);
|
||||
guarantee(faddr != NULL && faddr->is_double(), "wrong flag type");
|
||||
faddr->set_double(value);
|
||||
faddr->origin = origin;
|
||||
faddr->set_origin(origin);
|
||||
}
|
||||
|
||||
bool CommandLineFlags::ccstrAt(char* name, size_t len, ccstr* value) {
|
||||
|
|
@ -519,7 +702,7 @@ bool CommandLineFlags::ccstrAt(char* name, size_t len, ccstr* value) {
|
|||
|
||||
// Contract: Flag will make private copy of the incoming value.
|
||||
// Outgoing value is always malloc-ed, and caller MUST call free.
|
||||
bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, FlagValueOrigin origin) {
|
||||
bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, Flag::Flags origin) {
|
||||
Flag* result = Flag::find_flag(name, len);
|
||||
if (result == NULL) return false;
|
||||
if (!result->is_ccstr()) return false;
|
||||
|
|
@ -530,35 +713,35 @@ bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, FlagValu
|
|||
strcpy(new_value, *value);
|
||||
}
|
||||
result->set_ccstr(new_value);
|
||||
if (result->origin == DEFAULT && old_value != NULL) {
|
||||
if (result->is_default() && old_value != NULL) {
|
||||
// Prior value is NOT heap allocated, but was a literal constant.
|
||||
char* old_value_to_free = NEW_C_HEAP_ARRAY(char, strlen(old_value)+1, mtInternal);
|
||||
strcpy(old_value_to_free, old_value);
|
||||
old_value = old_value_to_free;
|
||||
}
|
||||
*value = old_value;
|
||||
result->origin = origin;
|
||||
result->set_origin(origin);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Contract: Flag will make private copy of the incoming value.
|
||||
void CommandLineFlagsEx::ccstrAtPut(CommandLineFlagWithType flag, ccstr value, FlagValueOrigin origin) {
|
||||
void CommandLineFlagsEx::ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin) {
|
||||
Flag* faddr = address_of_flag(flag);
|
||||
guarantee(faddr != NULL && faddr->is_ccstr(), "wrong flag type");
|
||||
ccstr old_value = faddr->get_ccstr();
|
||||
char* new_value = NEW_C_HEAP_ARRAY(char, strlen(value)+1, mtInternal);
|
||||
strcpy(new_value, value);
|
||||
faddr->set_ccstr(new_value);
|
||||
if (faddr->origin != DEFAULT && old_value != NULL) {
|
||||
if (!faddr->is_default() && old_value != NULL) {
|
||||
// Prior value is heap allocated so free it.
|
||||
FREE_C_HEAP_ARRAY(char, old_value, mtInternal);
|
||||
}
|
||||
faddr->origin = origin;
|
||||
faddr->set_origin(origin);
|
||||
}
|
||||
|
||||
extern "C" {
|
||||
static int compare_flags(const void* void_a, const void* void_b) {
|
||||
return strcmp((*((Flag**) void_a))->name, (*((Flag**) void_b))->name);
|
||||
return strcmp((*((Flag**) void_a))->_name, (*((Flag**) void_b))->_name);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -567,20 +750,19 @@ void CommandLineFlags::printSetFlags(outputStream* out) {
|
|||
// note: this method is called before the thread structure is in place
|
||||
// which means resource allocation cannot be used.
|
||||
|
||||
// Compute size
|
||||
int length= 0;
|
||||
while (flagTable[length].name != NULL) length++;
|
||||
// The last entry is the null entry.
|
||||
const size_t length = Flag::numFlags - 1;
|
||||
|
||||
// Sort
|
||||
Flag** array = NEW_C_HEAP_ARRAY(Flag*, length, mtInternal);
|
||||
for (int index = 0; index < length; index++) {
|
||||
array[index] = &flagTable[index];
|
||||
for (size_t i = 0; i < length; i++) {
|
||||
array[i] = &flagTable[i];
|
||||
}
|
||||
qsort(array, length, sizeof(Flag*), compare_flags);
|
||||
|
||||
// Print
|
||||
for (int i = 0; i < length; i++) {
|
||||
if (array[i]->origin /* naked field! */) {
|
||||
for (size_t i = 0; i < length; i++) {
|
||||
if (array[i]->get_origin() /* naked field! */) {
|
||||
array[i]->print_as_flag(out);
|
||||
out->print(" ");
|
||||
}
|
||||
|
|
@ -603,20 +785,19 @@ void CommandLineFlags::printFlags(outputStream* out, bool withComments) {
|
|||
// note: this method is called before the thread structure is in place
|
||||
// which means resource allocation cannot be used.
|
||||
|
||||
// Compute size
|
||||
int length= 0;
|
||||
while (flagTable[length].name != NULL) length++;
|
||||
// The last entry is the null entry.
|
||||
const size_t length = Flag::numFlags - 1;
|
||||
|
||||
// Sort
|
||||
Flag** array = NEW_C_HEAP_ARRAY(Flag*, length, mtInternal);
|
||||
for (int index = 0; index < length; index++) {
|
||||
array[index] = &flagTable[index];
|
||||
for (size_t i = 0; i < length; i++) {
|
||||
array[i] = &flagTable[i];
|
||||
}
|
||||
qsort(array, length, sizeof(Flag*), compare_flags);
|
||||
|
||||
// Print
|
||||
out->print_cr("[Global flags]");
|
||||
for (int i = 0; i < length; i++) {
|
||||
for (size_t i = 0; i < length; i++) {
|
||||
if (array[i]->is_unlocked()) {
|
||||
array[i]->print_on(out, withComments);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue