author | twisti |
Mon, 18 Jun 2012 12:29:21 -0700 | |
changeset 13106 | cecfb99d6cff |
parent 12598 | 1256ef9b648a |
child 13195 | be27e1b6a4b9 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
2 |
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4579
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4579
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4579
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "memory/allocation.inline.hpp" |
|
27 |
#include "oops/oop.inline.hpp" |
|
28 |
#include "runtime/arguments.hpp" |
|
29 |
#include "runtime/globals.hpp" |
|
30 |
#include "runtime/globals_extension.hpp" |
|
31 |
#include "utilities/ostream.hpp" |
|
32 |
#include "utilities/top.hpp" |
|
33 |
#ifndef SERIALGC |
|
34 |
#include "gc_implementation/g1/g1_globals.hpp" |
|
35 |
#endif |
|
36 |
#ifdef COMPILER1 |
|
37 |
#include "c1/c1_globals.hpp" |
|
38 |
#endif |
|
39 |
#ifdef COMPILER2 |
|
40 |
#include "opto/c2_globals.hpp" |
|
41 |
#endif |
|
42 |
#ifdef SHARK |
|
43 |
#include "shark/shark_globals.hpp" |
|
44 |
#endif |
|
1 | 45 |
|
46 |
||
47 |
RUNTIME_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, \ |
|
48 |
MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, \ |
|
11167
3931428f62ae
7116730: Revert 7116481: Commercial features in Hotspot must be gated by a switch
phh
parents:
11166
diff
changeset
|
49 |
MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_EXPERIMENTAL_FLAG, \ |
3931428f62ae
7116730: Revert 7116481: Commercial features in Hotspot must be gated by a switch
phh
parents:
11166
diff
changeset
|
50 |
MATERIALIZE_NOTPRODUCT_FLAG, \ |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
350
diff
changeset
|
51 |
MATERIALIZE_MANAGEABLE_FLAG, MATERIALIZE_PRODUCT_RW_FLAG, \ |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
350
diff
changeset
|
52 |
MATERIALIZE_LP64_PRODUCT_FLAG) |
1 | 53 |
|
54 |
RUNTIME_OS_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, \ |
|
55 |
MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, \ |
|
56 |
MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_NOTPRODUCT_FLAG) |
|
57 |
||
11183
a81bb5c041d3
7117389: Add a framework for vendor-specific command line switch extensions to Hotspot
phh
parents:
11167
diff
changeset
|
58 |
MATERIALIZE_FLAGS_EXT |
a81bb5c041d3
7117389: Add a framework for vendor-specific command line switch extensions to Hotspot
phh
parents:
11167
diff
changeset
|
59 |
|
a81bb5c041d3
7117389: Add a framework for vendor-specific command line switch extensions to Hotspot
phh
parents:
11167
diff
changeset
|
60 |
|
1 | 61 |
bool Flag::is_unlocker() const { |
11167
3931428f62ae
7116730: Revert 7116481: Commercial features in Hotspot must be gated by a switch
phh
parents:
11166
diff
changeset
|
62 |
return strcmp(name, "UnlockDiagnosticVMOptions") == 0 || |
11183
a81bb5c041d3
7117389: Add a framework for vendor-specific command line switch extensions to Hotspot
phh
parents:
11167
diff
changeset
|
63 |
strcmp(name, "UnlockExperimentalVMOptions") == 0 || |
a81bb5c041d3
7117389: Add a framework for vendor-specific command line switch extensions to Hotspot
phh
parents:
11167
diff
changeset
|
64 |
is_unlocker_ext(); |
1 | 65 |
} |
66 |
||
67 |
bool Flag::is_unlocked() const { |
|
11167
3931428f62ae
7116730: Revert 7116481: Commercial features in Hotspot must be gated by a switch
phh
parents:
11166
diff
changeset
|
68 |
if (strcmp(kind, "{diagnostic}") == 0) { |
9116 | 69 |
if (strcmp(name, "EnableInvokeDynamic") == 0 && UnlockExperimentalVMOptions && !UnlockDiagnosticVMOptions) { |
70 |
// transitional logic to allow tests to run until they are changed |
|
71 |
static int warned; |
|
72 |
if (++warned == 1) warning("Use -XX:+UnlockDiagnosticVMOptions before EnableInvokeDynamic flag"); |
|
73 |
return true; |
|
74 |
} |
|
1 | 75 |
return UnlockDiagnosticVMOptions; |
4450
6d700b859b3e
6892658: C2 should optimize some stringbuilder patterns
never
parents:
4437
diff
changeset
|
76 |
} else if (strcmp(kind, "{experimental}") == 0 || |
6d700b859b3e
6892658: C2 should optimize some stringbuilder patterns
never
parents:
4437
diff
changeset
|
77 |
strcmp(kind, "{C2 experimental}") == 0) { |
1382
fa3de4068282
6618726: Introduce -XX:+UnlockExperimentalVMOptions flag
ysr
parents:
1374
diff
changeset
|
78 |
return UnlockExperimentalVMOptions; |
1 | 79 |
} else { |
11183
a81bb5c041d3
7117389: Add a framework for vendor-specific command line switch extensions to Hotspot
phh
parents:
11167
diff
changeset
|
80 |
return is_unlocked_ext(); |
1 | 81 |
} |
82 |
} |
|
83 |
||
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
84 |
// Get custom message for this locked flag, or return NULL if |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
85 |
// none is available. |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
86 |
void Flag::get_locked_message(char* buf, int buflen) const { |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
87 |
get_locked_message_ext(buf, buflen); |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
88 |
} |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
89 |
|
1 | 90 |
bool Flag::is_writeable() const { |
11254
e2dd3c32a7cb
7122880: Extend vendor-specific command interface to include manageable switches
phh
parents:
11183
diff
changeset
|
91 |
return strcmp(kind, "{manageable}") == 0 || |
e2dd3c32a7cb
7122880: Extend vendor-specific command interface to include manageable switches
phh
parents:
11183
diff
changeset
|
92 |
strcmp(kind, "{product rw}") == 0 || |
e2dd3c32a7cb
7122880: Extend vendor-specific command interface to include manageable switches
phh
parents:
11183
diff
changeset
|
93 |
is_writeable_ext(); |
1 | 94 |
} |
95 |
||
11254
e2dd3c32a7cb
7122880: Extend vendor-specific command interface to include manageable switches
phh
parents:
11183
diff
changeset
|
96 |
// All flags except "manageable" are assumed to be internal flags. |
1 | 97 |
// Long term, we need to define a mechanism to specify which flags |
98 |
// are external/stable and change this function accordingly. |
|
99 |
bool Flag::is_external() const { |
|
11254
e2dd3c32a7cb
7122880: Extend vendor-specific command interface to include manageable switches
phh
parents:
11183
diff
changeset
|
100 |
return strcmp(kind, "{manageable}") == 0 || is_external_ext(); |
1 | 101 |
} |
102 |
||
11254
e2dd3c32a7cb
7122880: Extend vendor-specific command interface to include manageable switches
phh
parents:
11183
diff
changeset
|
103 |
|
1 | 104 |
// Length of format string (e.g. "%.1234s") for printing ccstr below |
105 |
#define FORMAT_BUFFER_LEN 16 |
|
106 |
||
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
107 |
void Flag::print_on(outputStream* st, bool withComments) { |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
108 |
st->print("%9s %-40s %c= ", type, name, (origin != DEFAULT ? ':' : ' ')); |
4437
d1abc17afffb
6898160: Need serviceability support for new vm argument type 'uint64_t'
phh
parents:
4434
diff
changeset
|
109 |
if (is_bool()) st->print("%-16s", get_bool() ? "true" : "false"); |
d1abc17afffb
6898160: Need serviceability support for new vm argument type 'uint64_t'
phh
parents:
4434
diff
changeset
|
110 |
if (is_intx()) st->print("%-16ld", get_intx()); |
d1abc17afffb
6898160: Need serviceability support for new vm argument type 'uint64_t'
phh
parents:
4434
diff
changeset
|
111 |
if (is_uintx()) st->print("%-16lu", get_uintx()); |
d1abc17afffb
6898160: Need serviceability support for new vm argument type 'uint64_t'
phh
parents:
4434
diff
changeset
|
112 |
if (is_uint64_t()) st->print("%-16lu", get_uint64_t()); |
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
113 |
if (is_double()) st->print("%-16f", get_double()); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
114 |
|
1 | 115 |
if (is_ccstr()) { |
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
116 |
const char* cp = get_ccstr(); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
117 |
if (cp != NULL) { |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
118 |
const char* eol; |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
119 |
while ((eol = strchr(cp, '\n')) != NULL) { |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
120 |
char format_buffer[FORMAT_BUFFER_LEN]; |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
121 |
size_t llen = pointer_delta(eol, cp, sizeof(char)); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
122 |
jio_snprintf(format_buffer, FORMAT_BUFFER_LEN, |
350 | 123 |
"%%." SIZE_FORMAT "s", llen); |
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
124 |
st->print(format_buffer, cp); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
125 |
st->cr(); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
126 |
cp = eol+1; |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
127 |
st->print("%5s %-35s += ", "", name); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
128 |
} |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
129 |
st->print("%-16s", cp); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
130 |
} |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
131 |
else st->print("%-16s", ""); |
1 | 132 |
} |
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
133 |
st->print("%-20s", kind); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
134 |
if (withComments) { |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
135 |
#ifndef PRODUCT |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
136 |
st->print("%s", doc ); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
137 |
#endif |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
138 |
} |
1 | 139 |
st->cr(); |
140 |
} |
|
141 |
||
142 |
void Flag::print_as_flag(outputStream* st) { |
|
143 |
if (is_bool()) { |
|
144 |
st->print("-XX:%s%s", get_bool() ? "+" : "-", name); |
|
145 |
} else if (is_intx()) { |
|
146 |
st->print("-XX:%s=" INTX_FORMAT, name, get_intx()); |
|
147 |
} else if (is_uintx()) { |
|
148 |
st->print("-XX:%s=" UINTX_FORMAT, name, get_uintx()); |
|
4437
d1abc17afffb
6898160: Need serviceability support for new vm argument type 'uint64_t'
phh
parents:
4434
diff
changeset
|
149 |
} else if (is_uint64_t()) { |
d1abc17afffb
6898160: Need serviceability support for new vm argument type 'uint64_t'
phh
parents:
4434
diff
changeset
|
150 |
st->print("-XX:%s=" UINT64_FORMAT, name, get_uint64_t()); |
12598
1256ef9b648a
7167069: 6 VM flags crash the VM when queried via jinfo
brutisso
parents:
12157
diff
changeset
|
151 |
} else if (is_double()) { |
1256ef9b648a
7167069: 6 VM flags crash the VM when queried via jinfo
brutisso
parents:
12157
diff
changeset
|
152 |
st->print("-XX:%s=%f", name, get_double()); |
1 | 153 |
} else if (is_ccstr()) { |
154 |
st->print("-XX:%s=", name); |
|
350 | 155 |
const char* cp = get_ccstr(); |
156 |
if (cp != NULL) { |
|
157 |
// Need to turn embedded '\n's back into separate arguments |
|
158 |
// Not so efficient to print one character at a time, |
|
159 |
// but the choice is to do the transformation to a buffer |
|
160 |
// and print that. And this need not be efficient. |
|
161 |
for (; *cp != '\0'; cp += 1) { |
|
162 |
switch (*cp) { |
|
163 |
default: |
|
164 |
st->print("%c", *cp); |
|
165 |
break; |
|
166 |
case '\n': |
|
167 |
st->print(" -XX:%s=", name); |
|
168 |
break; |
|
169 |
} |
|
1 | 170 |
} |
171 |
} |
|
172 |
} else { |
|
173 |
ShouldNotReachHere(); |
|
174 |
} |
|
175 |
} |
|
176 |
||
177 |
// 4991491 do not "optimize out" the was_set false values: omitting them |
|
178 |
// tickles a Microsoft compiler bug causing flagTable to be malformed |
|
179 |
||
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
180 |
#define RUNTIME_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
181 |
#define RUNTIME_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{pd product}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
182 |
#define RUNTIME_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{diagnostic}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
183 |
#define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{experimental}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
184 |
#define RUNTIME_MANAGEABLE_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{manageable}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
185 |
#define RUNTIME_PRODUCT_RW_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product rw}", DEFAULT }, |
1 | 186 |
|
187 |
#ifdef PRODUCT |
|
188 |
#define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ |
|
189 |
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ |
|
190 |
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) |
|
191 |
#else |
|
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
192 |
#define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
193 |
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{pd}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
194 |
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{notproduct}", DEFAULT }, |
1 | 195 |
#endif |
196 |
||
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
350
diff
changeset
|
197 |
#ifdef _LP64 |
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
198 |
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{lp64_product}", DEFAULT }, |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
350
diff
changeset
|
199 |
#else |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
350
diff
changeset
|
200 |
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
350
diff
changeset
|
201 |
#endif // _LP64 |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
350
diff
changeset
|
202 |
|
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
203 |
#define C1_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 product}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
204 |
#define C1_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 pd product}", DEFAULT }, |
1 | 205 |
#ifdef PRODUCT |
206 |
#define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ |
|
207 |
#define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ |
|
208 |
#define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) |
|
209 |
#else |
|
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
210 |
#define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
211 |
#define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C1 pd}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
212 |
#define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1 notproduct}", DEFAULT }, |
1 | 213 |
#endif |
214 |
||
215 |
||
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
216 |
#define C2_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 product}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
217 |
#define C2_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 pd product}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
218 |
#define C2_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 diagnostic}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
219 |
#define C2_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 experimental}", DEFAULT }, |
1 | 220 |
#ifdef PRODUCT |
221 |
#define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ |
|
222 |
#define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ |
|
223 |
#define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) |
|
224 |
#else |
|
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
225 |
#define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
226 |
#define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C2 pd}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
227 |
#define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2 notproduct}", DEFAULT }, |
1 | 228 |
#endif |
229 |
||
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
230 |
#define SHARK_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark product}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
231 |
#define SHARK_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark pd product}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
232 |
#define SHARK_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark diagnostic}", DEFAULT }, |
6187 | 233 |
#ifdef PRODUCT |
234 |
#define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ |
|
235 |
#define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ |
|
236 |
#define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) |
|
237 |
#else |
|
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
238 |
#define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
239 |
#define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{Shark pd}", DEFAULT }, |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6187
diff
changeset
|
240 |
#define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark notproduct}", DEFAULT }, |
6187 | 241 |
#endif |
1 | 242 |
|
243 |
static Flag flagTable[] = { |
|
11167
3931428f62ae
7116730: Revert 7116481: Commercial features in Hotspot must be gated by a switch
phh
parents:
11166
diff
changeset
|
244 |
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) |
1 | 245 |
RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT) |
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
360
diff
changeset
|
246 |
#ifndef SERIALGC |
1382
fa3de4068282
6618726: Introduce -XX:+UnlockExperimentalVMOptions flag
ysr
parents:
1374
diff
changeset
|
247 |
G1_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) |
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
360
diff
changeset
|
248 |
#endif // SERIALGC |
1 | 249 |
#ifdef COMPILER1 |
250 |
C1_FLAGS(C1_DEVELOP_FLAG_STRUCT, C1_PD_DEVELOP_FLAG_STRUCT, C1_PRODUCT_FLAG_STRUCT, C1_PD_PRODUCT_FLAG_STRUCT, C1_NOTPRODUCT_FLAG_STRUCT) |
|
251 |
#endif |
|
252 |
#ifdef COMPILER2 |
|
4450
6d700b859b3e
6892658: C2 should optimize some stringbuilder patterns
never
parents:
4437
diff
changeset
|
253 |
C2_FLAGS(C2_DEVELOP_FLAG_STRUCT, C2_PD_DEVELOP_FLAG_STRUCT, C2_PRODUCT_FLAG_STRUCT, C2_PD_PRODUCT_FLAG_STRUCT, C2_DIAGNOSTIC_FLAG_STRUCT, C2_EXPERIMENTAL_FLAG_STRUCT, C2_NOTPRODUCT_FLAG_STRUCT) |
1 | 254 |
#endif |
6187 | 255 |
#ifdef SHARK |
256 |
SHARK_FLAGS(SHARK_DEVELOP_FLAG_STRUCT, SHARK_PD_DEVELOP_FLAG_STRUCT, SHARK_PRODUCT_FLAG_STRUCT, SHARK_PD_PRODUCT_FLAG_STRUCT, SHARK_DIAGNOSTIC_FLAG_STRUCT, SHARK_NOTPRODUCT_FLAG_STRUCT) |
|
257 |
#endif |
|
11183
a81bb5c041d3
7117389: Add a framework for vendor-specific command line switch extensions to Hotspot
phh
parents:
11167
diff
changeset
|
258 |
FLAGTABLE_EXT |
1 | 259 |
{0, NULL, NULL} |
260 |
}; |
|
261 |
||
262 |
Flag* Flag::flags = flagTable; |
|
263 |
size_t Flag::numFlags = (sizeof(flagTable) / sizeof(Flag)); |
|
264 |
||
265 |
inline bool str_equal(const char* s, char* q, size_t len) { |
|
266 |
// s is null terminated, q is not! |
|
267 |
if (strlen(s) != (unsigned int) len) return false; |
|
268 |
return strncmp(s, q, len) == 0; |
|
269 |
} |
|
270 |
||
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
271 |
// Search the flag table for a named flag |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
272 |
Flag* Flag::find_flag(char* name, size_t length, bool allow_locked) { |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
273 |
for (Flag* current = &flagTable[0]; current->name != NULL; current++) { |
1 | 274 |
if (str_equal(current->name, name, length)) { |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
275 |
// Found a matching entry. Report locked flags only if allowed. |
1 | 276 |
if (!(current->is_unlocked() || current->is_unlocker())) { |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
277 |
if (!allow_locked) { |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
278 |
// disable use of locked flags, e.g. diagnostic, experimental, |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
279 |
// commercial... until they are explicitly unlocked |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
280 |
return NULL; |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
281 |
} |
1 | 282 |
} |
283 |
return current; |
|
284 |
} |
|
285 |
} |
|
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
11441
diff
changeset
|
286 |
// Flag name is not in the flag table |
1 | 287 |
return NULL; |
288 |
} |
|
289 |
||
290 |
// Returns the address of the index'th element |
|
291 |
static Flag* address_of_flag(CommandLineFlagWithType flag) { |
|
292 |
assert((size_t)flag < Flag::numFlags, "bad command line flag index"); |
|
293 |
return &Flag::flags[flag]; |
|
294 |
} |
|
295 |
||
296 |
bool CommandLineFlagsEx::is_default(CommandLineFlag flag) { |
|
297 |
assert((size_t)flag < Flag::numFlags, "bad command line flag index"); |
|
298 |
Flag* f = &Flag::flags[flag]; |
|
299 |
return (f->origin == DEFAULT); |
|
300 |
} |
|
301 |
||
186
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
302 |
bool CommandLineFlagsEx::is_ergo(CommandLineFlag flag) { |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
303 |
assert((size_t)flag < Flag::numFlags, "bad command line flag index"); |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
304 |
Flag* f = &Flag::flags[flag]; |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
305 |
return (f->origin == ERGONOMIC); |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
306 |
} |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
307 |
|
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
308 |
bool CommandLineFlagsEx::is_cmdline(CommandLineFlag flag) { |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
309 |
assert((size_t)flag < Flag::numFlags, "bad command line flag index"); |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
310 |
Flag* f = &Flag::flags[flag]; |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
311 |
return (f->origin == COMMAND_LINE); |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
312 |
} |
32e6c95f8d9b
6557851: CMS: ergonomics defaults are not set with FLAG_SET_ERGO
jmasa
parents:
1
diff
changeset
|
313 |
|
1 | 314 |
bool CommandLineFlags::wasSetOnCmdline(const char* name, bool* value) { |
315 |
Flag* result = Flag::find_flag((char*)name, strlen(name)); |
|
316 |
if (result == NULL) return false; |
|
317 |
*value = (result->origin == COMMAND_LINE); |
|
318 |
return true; |
|
319 |
} |
|
320 |
||
321 |
bool CommandLineFlags::boolAt(char* name, size_t len, bool* value) { |
|
322 |
Flag* result = Flag::find_flag(name, len); |
|
323 |
if (result == NULL) return false; |
|
324 |
if (!result->is_bool()) return false; |
|
325 |
*value = result->get_bool(); |
|
326 |
return true; |
|
327 |
} |
|
328 |
||
329 |
bool CommandLineFlags::boolAtPut(char* name, size_t len, bool* value, FlagValueOrigin origin) { |
|
330 |
Flag* result = Flag::find_flag(name, len); |
|
331 |
if (result == NULL) return false; |
|
332 |
if (!result->is_bool()) return false; |
|
333 |
bool old_value = result->get_bool(); |
|
334 |
result->set_bool(*value); |
|
335 |
*value = old_value; |
|
336 |
result->origin = origin; |
|
337 |
return true; |
|
338 |
} |
|
339 |
||
340 |
void CommandLineFlagsEx::boolAtPut(CommandLineFlagWithType flag, bool value, FlagValueOrigin origin) { |
|
341 |
Flag* faddr = address_of_flag(flag); |
|
342 |
guarantee(faddr != NULL && faddr->is_bool(), "wrong flag type"); |
|
343 |
faddr->set_bool(value); |
|
344 |
faddr->origin = origin; |
|
345 |
} |
|
346 |
||
347 |
bool CommandLineFlags::intxAt(char* name, size_t len, intx* value) { |
|
348 |
Flag* result = Flag::find_flag(name, len); |
|
349 |
if (result == NULL) return false; |
|
350 |
if (!result->is_intx()) return false; |
|
351 |
*value = result->get_intx(); |
|
352 |
return true; |
|
353 |
} |
|
354 |
||
355 |
bool CommandLineFlags::intxAtPut(char* name, size_t len, intx* value, FlagValueOrigin origin) { |
|
356 |
Flag* result = Flag::find_flag(name, len); |
|
357 |
if (result == NULL) return false; |
|
358 |
if (!result->is_intx()) return false; |
|
359 |
intx old_value = result->get_intx(); |
|
360 |
result->set_intx(*value); |
|
361 |
*value = old_value; |
|
362 |
result->origin = origin; |
|
363 |
return true; |
|
364 |
} |
|
365 |
||
366 |
void CommandLineFlagsEx::intxAtPut(CommandLineFlagWithType flag, intx value, FlagValueOrigin origin) { |
|
367 |
Flag* faddr = address_of_flag(flag); |
|
368 |
guarantee(faddr != NULL && faddr->is_intx(), "wrong flag type"); |
|
369 |
faddr->set_intx(value); |
|
370 |
faddr->origin = origin; |
|
371 |
} |
|
372 |
||
373 |
bool CommandLineFlags::uintxAt(char* name, size_t len, uintx* value) { |
|
374 |
Flag* result = Flag::find_flag(name, len); |
|
375 |
if (result == NULL) return false; |
|
376 |
if (!result->is_uintx()) return false; |
|
377 |
*value = result->get_uintx(); |
|
378 |
return true; |
|
379 |
} |
|
380 |
||
381 |
bool CommandLineFlags::uintxAtPut(char* name, size_t len, uintx* value, FlagValueOrigin origin) { |
|
382 |
Flag* result = Flag::find_flag(name, len); |
|
383 |
if (result == NULL) return false; |
|
384 |
if (!result->is_uintx()) return false; |
|
385 |
uintx old_value = result->get_uintx(); |
|
386 |
result->set_uintx(*value); |
|
387 |
*value = old_value; |
|
388 |
result->origin = origin; |
|
389 |
return true; |
|
390 |
} |
|
391 |
||
392 |
void CommandLineFlagsEx::uintxAtPut(CommandLineFlagWithType flag, uintx value, FlagValueOrigin origin) { |
|
393 |
Flag* faddr = address_of_flag(flag); |
|
394 |
guarantee(faddr != NULL && faddr->is_uintx(), "wrong flag type"); |
|
395 |
faddr->set_uintx(value); |
|
396 |
faddr->origin = origin; |
|
397 |
} |
|
398 |
||
4434 | 399 |
bool CommandLineFlags::uint64_tAt(char* name, size_t len, uint64_t* value) { |
400 |
Flag* result = Flag::find_flag(name, len); |
|
401 |
if (result == NULL) return false; |
|
402 |
if (!result->is_uint64_t()) return false; |
|
403 |
*value = result->get_uint64_t(); |
|
404 |
return true; |
|
405 |
} |
|
406 |
||
407 |
bool CommandLineFlags::uint64_tAtPut(char* name, size_t len, uint64_t* value, FlagValueOrigin origin) { |
|
408 |
Flag* result = Flag::find_flag(name, len); |
|
409 |
if (result == NULL) return false; |
|
410 |
if (!result->is_uint64_t()) return false; |
|
411 |
uint64_t old_value = result->get_uint64_t(); |
|
412 |
result->set_uint64_t(*value); |
|
413 |
*value = old_value; |
|
414 |
result->origin = origin; |
|
415 |
return true; |
|
416 |
} |
|
417 |
||
418 |
void CommandLineFlagsEx::uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, FlagValueOrigin origin) { |
|
419 |
Flag* faddr = address_of_flag(flag); |
|
420 |
guarantee(faddr != NULL && faddr->is_uint64_t(), "wrong flag type"); |
|
421 |
faddr->set_uint64_t(value); |
|
422 |
faddr->origin = origin; |
|
423 |
} |
|
424 |
||
1 | 425 |
bool CommandLineFlags::doubleAt(char* name, size_t len, double* value) { |
426 |
Flag* result = Flag::find_flag(name, len); |
|
427 |
if (result == NULL) return false; |
|
428 |
if (!result->is_double()) return false; |
|
429 |
*value = result->get_double(); |
|
430 |
return true; |
|
431 |
} |
|
432 |
||
433 |
bool CommandLineFlags::doubleAtPut(char* name, size_t len, double* value, FlagValueOrigin origin) { |
|
434 |
Flag* result = Flag::find_flag(name, len); |
|
435 |
if (result == NULL) return false; |
|
436 |
if (!result->is_double()) return false; |
|
437 |
double old_value = result->get_double(); |
|
438 |
result->set_double(*value); |
|
439 |
*value = old_value; |
|
440 |
result->origin = origin; |
|
441 |
return true; |
|
442 |
} |
|
443 |
||
444 |
void CommandLineFlagsEx::doubleAtPut(CommandLineFlagWithType flag, double value, FlagValueOrigin origin) { |
|
445 |
Flag* faddr = address_of_flag(flag); |
|
446 |
guarantee(faddr != NULL && faddr->is_double(), "wrong flag type"); |
|
447 |
faddr->set_double(value); |
|
448 |
faddr->origin = origin; |
|
449 |
} |
|
450 |
||
451 |
bool CommandLineFlags::ccstrAt(char* name, size_t len, ccstr* value) { |
|
452 |
Flag* result = Flag::find_flag(name, len); |
|
453 |
if (result == NULL) return false; |
|
454 |
if (!result->is_ccstr()) return false; |
|
455 |
*value = result->get_ccstr(); |
|
456 |
return true; |
|
457 |
} |
|
458 |
||
459 |
// Contract: Flag will make private copy of the incoming value. |
|
460 |
// Outgoing value is always malloc-ed, and caller MUST call free. |
|
461 |
bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, FlagValueOrigin origin) { |
|
462 |
Flag* result = Flag::find_flag(name, len); |
|
463 |
if (result == NULL) return false; |
|
464 |
if (!result->is_ccstr()) return false; |
|
465 |
ccstr old_value = result->get_ccstr(); |
|
1402
ccb40ce62b79
6744783: HotSpot segfaults if given -XX options with an empty string argument
never
parents:
670
diff
changeset
|
466 |
char* new_value = NULL; |
ccb40ce62b79
6744783: HotSpot segfaults if given -XX options with an empty string argument
never
parents:
670
diff
changeset
|
467 |
if (*value != NULL) { |
ccb40ce62b79
6744783: HotSpot segfaults if given -XX options with an empty string argument
never
parents:
670
diff
changeset
|
468 |
new_value = NEW_C_HEAP_ARRAY(char, strlen(*value)+1); |
ccb40ce62b79
6744783: HotSpot segfaults if given -XX options with an empty string argument
never
parents:
670
diff
changeset
|
469 |
strcpy(new_value, *value); |
ccb40ce62b79
6744783: HotSpot segfaults if given -XX options with an empty string argument
never
parents:
670
diff
changeset
|
470 |
} |
1 | 471 |
result->set_ccstr(new_value); |
472 |
if (result->origin == DEFAULT && old_value != NULL) { |
|
473 |
// Prior value is NOT heap allocated, but was a literal constant. |
|
474 |
char* old_value_to_free = NEW_C_HEAP_ARRAY(char, strlen(old_value)+1); |
|
475 |
strcpy(old_value_to_free, old_value); |
|
476 |
old_value = old_value_to_free; |
|
477 |
} |
|
478 |
*value = old_value; |
|
479 |
result->origin = origin; |
|
480 |
return true; |
|
481 |
} |
|
482 |
||
483 |
// Contract: Flag will make private copy of the incoming value. |
|
484 |
void CommandLineFlagsEx::ccstrAtPut(CommandLineFlagWithType flag, ccstr value, FlagValueOrigin origin) { |
|
485 |
Flag* faddr = address_of_flag(flag); |
|
486 |
guarantee(faddr != NULL && faddr->is_ccstr(), "wrong flag type"); |
|
487 |
ccstr old_value = faddr->get_ccstr(); |
|
488 |
char* new_value = NEW_C_HEAP_ARRAY(char, strlen(value)+1); |
|
489 |
strcpy(new_value, value); |
|
490 |
faddr->set_ccstr(new_value); |
|
491 |
if (faddr->origin != DEFAULT && old_value != NULL) { |
|
492 |
// Prior value is heap allocated so free it. |
|
493 |
FREE_C_HEAP_ARRAY(char, old_value); |
|
494 |
} |
|
495 |
faddr->origin = origin; |
|
496 |
} |
|
497 |
||
498 |
extern "C" { |
|
499 |
static int compare_flags(const void* void_a, const void* void_b) { |
|
500 |
return strcmp((*((Flag**) void_a))->name, (*((Flag**) void_b))->name); |
|
501 |
} |
|
502 |
} |
|
503 |
||
11441 | 504 |
void CommandLineFlags::printSetFlags(outputStream* out) { |
1 | 505 |
// Print which flags were set on the command line |
506 |
// note: this method is called before the thread structure is in place |
|
507 |
// which means resource allocation cannot be used. |
|
508 |
||
509 |
// Compute size |
|
510 |
int length= 0; |
|
511 |
while (flagTable[length].name != NULL) length++; |
|
512 |
||
513 |
// Sort |
|
514 |
Flag** array = NEW_C_HEAP_ARRAY(Flag*, length); |
|
515 |
for (int index = 0; index < length; index++) { |
|
516 |
array[index] = &flagTable[index]; |
|
517 |
} |
|
518 |
qsort(array, length, sizeof(Flag*), compare_flags); |
|
519 |
||
520 |
||
521 |
for (int i = 0; i < length; i++) { |
|
522 |
if (array[i]->origin /* naked field! */) { |
|
11441 | 523 |
array[i]->print_as_flag(out); |
524 |
out->print(" "); |
|
1 | 525 |
} |
526 |
} |
|
11441 | 527 |
out->cr(); |
1 | 528 |
FREE_C_HEAP_ARRAY(Flag*, array); |
529 |
} |
|
530 |
||
531 |
#ifndef PRODUCT |
|
532 |
||
533 |
||
534 |
void CommandLineFlags::verify() { |
|
535 |
assert(Arguments::check_vm_args_consistency(), "Some flag settings conflict"); |
|
536 |
} |
|
537 |
||
4579 | 538 |
#endif // PRODUCT |
539 |
||
11441 | 540 |
void CommandLineFlags::printFlags(outputStream* out, bool withComments) { |
1 | 541 |
// Print the flags sorted by name |
542 |
// note: this method is called before the thread structure is in place |
|
543 |
// which means resource allocation cannot be used. |
|
544 |
||
545 |
// Compute size |
|
546 |
int length= 0; |
|
547 |
while (flagTable[length].name != NULL) length++; |
|
548 |
||
549 |
// Sort |
|
550 |
Flag** array = NEW_C_HEAP_ARRAY(Flag*, length); |
|
551 |
for (int index = 0; index < length; index++) { |
|
552 |
array[index] = &flagTable[index]; |
|
553 |
} |
|
554 |
qsort(array, length, sizeof(Flag*), compare_flags); |
|
555 |
||
556 |
||
11441 | 557 |
out->print_cr("[Global flags]"); |
1 | 558 |
for (int i = 0; i < length; i++) { |
559 |
if (array[i]->is_unlocked()) { |
|
11441 | 560 |
array[i]->print_on(out, withComments); |
1 | 561 |
} |
562 |
} |
|
563 |
FREE_C_HEAP_ARRAY(Flag*, array); |
|
564 |
} |