author | shade |
Thu, 30 Nov 2017 17:13:33 +0100 | |
branch | epsilon-gc-branch |
changeset 55934 | 912c55e702d6 |
parent 55767 | 8e22715afabc |
parent 48025 | 6bc1de3b8c59 |
child 55974 | 06122633fead |
permissions | -rw-r--r-- |
1 | 1 |
/* |
43605
07baf498d588
8173421: Obsolete and expired flags for JDK 10 need to be removed and related tests updated
dholmes
parents:
42903
diff
changeset
|
2 |
* Copyright (c) 1997, 2017, 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:
5419
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5419
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:
5419
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
47765
b7c7428eaab9
8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot
coleenp
parents:
47572
diff
changeset
|
26 |
#include "jvm.h" |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
27 |
#include "classfile/classLoader.hpp" |
7397 | 28 |
#include "classfile/javaAssertions.hpp" |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42620
diff
changeset
|
29 |
#include "classfile/moduleEntry.hpp" |
24426
0a69c8cdfca9
8038654: Separate SymbolTable and StringTable code
gziemski
parents:
24014
diff
changeset
|
30 |
#include "classfile/stringTable.hpp" |
14487
9a40ad461ee9
7122219: Passed StringTableSize value not verified
hseigel
parents:
14296
diff
changeset
|
31 |
#include "classfile/symbolTable.hpp" |
47901
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
32 |
#include "gc/shared/gcArguments.hpp" |
30764 | 33 |
#include "gc/shared/genCollectedHeap.hpp" |
34 |
#include "gc/shared/referenceProcessor.hpp" |
|
35 |
#include "gc/shared/taskqueue.hpp" |
|
35061 | 36 |
#include "logging/log.hpp" |
40924 | 37 |
#include "logging/logConfiguration.hpp" |
38 |
#include "logging/logStream.hpp" |
|
35489 | 39 |
#include "logging/logTag.hpp" |
7397 | 40 |
#include "memory/allocation.inline.hpp" |
41 |
#include "memory/universe.inline.hpp" |
|
42 |
#include "oops/oop.inline.hpp" |
|
43 |
#include "prims/jvmtiExport.hpp" |
|
44 |
#include "runtime/arguments.hpp" |
|
26838
344fb68e970a
8057623: add an extension class for argument handling
jcoomes
parents:
26836
diff
changeset
|
45 |
#include "runtime/arguments_ext.hpp" |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
46 |
#include "runtime/commandLineFlagConstraintList.hpp" |
38273
2634194d7555
8073500: Prevent certain commercial flags from being changed at runtime
gziemski
parents:
38259
diff
changeset
|
47 |
#include "runtime/commandLineFlagWriteableList.hpp" |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
48 |
#include "runtime/commandLineFlagRangeList.hpp" |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
49 |
#include "runtime/globals.hpp" |
7397 | 50 |
#include "runtime/globals_extension.hpp" |
51 |
#include "runtime/java.hpp" |
|
25468
5331df506290
8048241: Introduce umbrella header os.inline.hpp and clean up includes
goetz
parents:
25076
diff
changeset
|
52 |
#include "runtime/os.hpp" |
47881
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
53 |
#include "runtime/safepointMechanism.hpp" |
25715
d5a8dbdc5150
8049325: Introduce and clean up umbrella headers for the files in the cpu subdirectories.
goetz
parents:
25468
diff
changeset
|
54 |
#include "runtime/vm_version.hpp" |
7397 | 55 |
#include "services/management.hpp" |
13195 | 56 |
#include "services/memTracker.hpp" |
46625 | 57 |
#include "utilities/align.hpp" |
7397 | 58 |
#include "utilities/defaultStream.hpp" |
15482
470d0b0c09f1
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
15119
diff
changeset
|
59 |
#include "utilities/macros.hpp" |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
60 |
#include "utilities/stringUtils.hpp" |
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
61 |
#if INCLUDE_JVMCI |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
62 |
#include "jvmci/jvmciRuntime.hpp" |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
63 |
#endif |
1 | 64 |
|
9130 | 65 |
// Note: This is a special bug reporting site for the JVM |
27463
335715f6906c
8060169: Update the Crash Reporting URL in the Java crash log
dbuck
parents:
27246
diff
changeset
|
66 |
#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp" |
1 | 67 |
#define DEFAULT_JAVA_LAUNCHER "generic" |
68 |
||
34125
56c4a2d19ee1
8141068: refactor -XXFlags= code in preparation for removal
rdurbin
parents:
33775
diff
changeset
|
69 |
char* Arguments::_jvm_flags_file = NULL; |
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
70 |
char** Arguments::_jvm_flags_array = NULL; |
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
71 |
int Arguments::_num_jvm_flags = 0; |
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
72 |
char** Arguments::_jvm_args_array = NULL; |
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
73 |
int Arguments::_num_jvm_args = 0; |
1 | 74 |
char* Arguments::_java_command = NULL; |
75 |
SystemProperty* Arguments::_system_properties = NULL; |
|
35872
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
76 |
const char* Arguments::_gc_log_filename = NULL; |
19986
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
77 |
size_t Arguments::_conservative_max_heap_alignment = 0; |
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
78 |
size_t Arguments::_min_heap_size = 0; |
1 | 79 |
Arguments::Mode Arguments::_mode = _mixed; |
80 |
bool Arguments::_java_compiler = false; |
|
81 |
bool Arguments::_xdebug_mode = false; |
|
82 |
const char* Arguments::_java_vendor_url_bug = DEFAULT_VENDOR_URL_BUG; |
|
83 |
const char* Arguments::_sun_java_launcher = DEFAULT_JAVA_LAUNCHER; |
|
84 |
int Arguments::_sun_java_launcher_pid = -1; |
|
22734
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
85 |
bool Arguments::_sun_java_launcher_is_altjvm = false; |
1 | 86 |
|
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
87 |
// These parameters are reset in method parse_vm_init_args() |
1 | 88 |
bool Arguments::_AlwaysCompileLoopMethods = AlwaysCompileLoopMethods; |
89 |
bool Arguments::_UseOnStackReplacement = UseOnStackReplacement; |
|
90 |
bool Arguments::_BackgroundCompilation = BackgroundCompilation; |
|
91 |
bool Arguments::_ClipInlining = ClipInlining; |
|
30201
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
92 |
intx Arguments::_Tier3InvokeNotifyFreqLog = Tier3InvokeNotifyFreqLog; |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
93 |
intx Arguments::_Tier4InvocationThreshold = Tier4InvocationThreshold; |
1 | 94 |
|
95 |
char* Arguments::SharedArchivePath = NULL; |
|
96 |
||
97 |
AgentLibraryList Arguments::_libraryList; |
|
98 |
AgentLibraryList Arguments::_agentList; |
|
99 |
||
100 |
abort_hook_t Arguments::_abort_hook = NULL; |
|
101 |
exit_hook_t Arguments::_exit_hook = NULL; |
|
102 |
vfprintf_hook_t Arguments::_vfprintf_hook = NULL; |
|
103 |
||
104 |
||
105 |
SystemProperty *Arguments::_sun_boot_library_path = NULL; |
|
106 |
SystemProperty *Arguments::_java_library_path = NULL; |
|
107 |
SystemProperty *Arguments::_java_home = NULL; |
|
108 |
SystemProperty *Arguments::_java_class_path = NULL; |
|
36508 | 109 |
SystemProperty *Arguments::_jdk_boot_class_path_append = NULL; |
110 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
111 |
GrowableArray<ModulePatchPath*> *Arguments::_patch_mod_prefix = NULL; |
36508 | 112 |
PathString *Arguments::_system_boot_class_path = NULL; |
40013 | 113 |
bool Arguments::_has_jimage = false; |
1 | 114 |
|
27562 | 115 |
char* Arguments::_ext_dirs = NULL; |
1 | 116 |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
117 |
// Check if head of 'option' matches 'name', and sets 'tail' to the remaining |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
118 |
// part of the option string. |
1 | 119 |
static bool match_option(const JavaVMOption *option, const char* name, |
120 |
const char** tail) { |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
121 |
size_t len = strlen(name); |
1 | 122 |
if (strncmp(option->optionString, name, len) == 0) { |
123 |
*tail = option->optionString + len; |
|
124 |
return true; |
|
125 |
} else { |
|
126 |
return false; |
|
127 |
} |
|
128 |
} |
|
129 |
||
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
130 |
// Check if 'option' matches 'name'. No "tail" is allowed. |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
131 |
static bool match_option(const JavaVMOption *option, const char* name) { |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
132 |
const char* tail = NULL; |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
133 |
bool result = match_option(option, name, &tail); |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
134 |
if (tail != NULL && *tail == '\0') { |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
135 |
return result; |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
136 |
} else { |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
137 |
return false; |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
138 |
} |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
139 |
} |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
140 |
|
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
141 |
// Return true if any of the strings in null-terminated array 'names' matches. |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
142 |
// If tail_allowed is true, then the tail must begin with a colon; otherwise, |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
143 |
// the option must match exactly. |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
144 |
static bool match_option(const JavaVMOption* option, const char** names, const char** tail, |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
145 |
bool tail_allowed) { |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
146 |
for (/* empty */; *names != NULL; ++names) { |
46630
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46625
diff
changeset
|
147 |
if (match_option(option, *names, tail)) { |
75aa3e39d02c
8182299: Enable disabled clang warnings, build on OSX 10 + Xcode 8
jwilhelm
parents:
46625
diff
changeset
|
148 |
if (**tail == '\0' || (tail_allowed && **tail == ':')) { |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
149 |
return true; |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
150 |
} |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
151 |
} |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
152 |
} |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
153 |
return false; |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
154 |
} |
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
155 |
|
1 | 156 |
static void logOption(const char* opt) { |
157 |
if (PrintVMOptions) { |
|
158 |
jio_fprintf(defaultStream::output_stream(), "VM option '%s'\n", opt); |
|
159 |
} |
|
160 |
} |
|
161 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
162 |
bool needs_module_property_warning = false; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
163 |
|
40896
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
164 |
#define MODULE_PROPERTY_PREFIX "jdk.module." |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
165 |
#define MODULE_PROPERTY_PREFIX_LEN 11 |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
166 |
#define ADDEXPORTS "addexports" |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
167 |
#define ADDEXPORTS_LEN 10 |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
168 |
#define ADDREADS "addreads" |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
169 |
#define ADDREADS_LEN 8 |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
170 |
#define ADDOPENS "addopens" |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
171 |
#define ADDOPENS_LEN 8 |
40896
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
172 |
#define PATCH "patch" |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
173 |
#define PATCH_LEN 5 |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
174 |
#define ADDMODS "addmods" |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
175 |
#define ADDMODS_LEN 7 |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
176 |
#define LIMITMODS "limitmods" |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
177 |
#define LIMITMODS_LEN 9 |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
178 |
#define PATH "path" |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
179 |
#define PATH_LEN 4 |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
180 |
#define UPGRADE_PATH "upgrade.path" |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
181 |
#define UPGRADE_PATH_LEN 12 |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
182 |
|
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
183 |
// Return TRUE if option matches 'property', or 'property=', or 'property.'. |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
184 |
static bool matches_property_suffix(const char* option, const char* property, size_t len) { |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
185 |
return ((strncmp(option, property, len) == 0) && |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
186 |
(option[len] == '=' || option[len] == '.' || option[len] == '\0')); |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
187 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
188 |
|
40896
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
189 |
// Return true if property starts with "jdk.module." and its ensuing chars match |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
190 |
// any of the reserved module properties. |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
191 |
// property should be passed without the leading "-D". |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
192 |
bool Arguments::is_internal_module_property(const char* property) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
193 |
assert((strncmp(property, "-D", 2) != 0), "Unexpected leading -D"); |
40896
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
194 |
if (strncmp(property, MODULE_PROPERTY_PREFIX, MODULE_PROPERTY_PREFIX_LEN) == 0) { |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
195 |
const char* property_suffix = property + MODULE_PROPERTY_PREFIX_LEN; |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
196 |
if (matches_property_suffix(property_suffix, ADDEXPORTS, ADDEXPORTS_LEN) || |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
197 |
matches_property_suffix(property_suffix, ADDREADS, ADDREADS_LEN) || |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
198 |
matches_property_suffix(property_suffix, ADDOPENS, ADDOPENS_LEN) || |
40896
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
199 |
matches_property_suffix(property_suffix, PATCH, PATCH_LEN) || |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
200 |
matches_property_suffix(property_suffix, ADDMODS, ADDMODS_LEN) || |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
201 |
matches_property_suffix(property_suffix, LIMITMODS, LIMITMODS_LEN) || |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
202 |
matches_property_suffix(property_suffix, PATH, PATH_LEN) || |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
203 |
matches_property_suffix(property_suffix, UPGRADE_PATH, UPGRADE_PATH_LEN)) { |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
204 |
return true; |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
205 |
} |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
206 |
} |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
207 |
return false; |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
208 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
209 |
|
1 | 210 |
// Process java launcher properties. |
211 |
void Arguments::process_sun_java_launcher_properties(JavaVMInitArgs* args) { |
|
22734
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
212 |
// See if sun.java.launcher, sun.java.launcher.is_altjvm or |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
213 |
// sun.java.launcher.pid is defined. |
1 | 214 |
// Must do this before setting up other system properties, |
215 |
// as some of them may depend on launcher type. |
|
216 |
for (int index = 0; index < args->nOptions; index++) { |
|
217 |
const JavaVMOption* option = args->options + index; |
|
218 |
const char* tail; |
|
219 |
||
220 |
if (match_option(option, "-Dsun.java.launcher=", &tail)) { |
|
221 |
process_java_launcher_argument(tail, option->extraInfo); |
|
222 |
continue; |
|
223 |
} |
|
22734
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
224 |
if (match_option(option, "-Dsun.java.launcher.is_altjvm=", &tail)) { |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
225 |
if (strcmp(tail, "true") == 0) { |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
226 |
_sun_java_launcher_is_altjvm = true; |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
227 |
} |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
228 |
continue; |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
229 |
} |
1 | 230 |
if (match_option(option, "-Dsun.java.launcher.pid=", &tail)) { |
231 |
_sun_java_launcher_pid = atoi(tail); |
|
232 |
continue; |
|
233 |
} |
|
234 |
} |
|
235 |
} |
|
236 |
||
237 |
// Initialize system properties key and value. |
|
238 |
void Arguments::init_system_properties() { |
|
36508 | 239 |
|
240 |
// Set up _system_boot_class_path which is not a property but |
|
241 |
// relies heavily on argument processing and the jdk.boot.class.path.append |
|
242 |
// property. It is used to store the underlying system boot class path. |
|
243 |
_system_boot_class_path = new PathString(NULL); |
|
244 |
||
1 | 245 |
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name", |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
246 |
"Java Virtual Machine Specification", false)); |
1 | 247 |
PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false)); |
248 |
PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false)); |
|
249 |
PropertyList_add(&_system_properties, new SystemProperty("java.vm.info", VM_Version::vm_info_string(), true)); |
|
33977
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
250 |
PropertyList_add(&_system_properties, new SystemProperty("jdk.debug", VM_Version::jdk_debug_level(), false)); |
1 | 251 |
|
22551 | 252 |
// Following are JVMTI agent writable properties. |
1 | 253 |
// Properties values are set to NULL and they are |
254 |
// os specific they are initialized in os::init_system_properties_values(). |
|
255 |
_sun_boot_library_path = new SystemProperty("sun.boot.library.path", NULL, true); |
|
256 |
_java_library_path = new SystemProperty("java.library.path", NULL, true); |
|
257 |
_java_home = new SystemProperty("java.home", NULL, true); |
|
258 |
_java_class_path = new SystemProperty("java.class.path", "", true); |
|
36508 | 259 |
// jdk.boot.class.path.append is a non-writeable, internal property. |
260 |
// It can only be set by either: |
|
261 |
// - -Xbootclasspath/a: |
|
262 |
// - AddToBootstrapClassLoaderSearch during JVMTI OnLoad phase |
|
263 |
_jdk_boot_class_path_append = new SystemProperty("jdk.boot.class.path.append", "", false, true); |
|
1 | 264 |
|
265 |
// Add to System Property list. |
|
266 |
PropertyList_add(&_system_properties, _sun_boot_library_path); |
|
267 |
PropertyList_add(&_system_properties, _java_library_path); |
|
268 |
PropertyList_add(&_system_properties, _java_home); |
|
269 |
PropertyList_add(&_system_properties, _java_class_path); |
|
36508 | 270 |
PropertyList_add(&_system_properties, _jdk_boot_class_path_append); |
1 | 271 |
|
272 |
// Set OS specific system properties values |
|
273 |
os::init_system_properties_values(); |
|
274 |
} |
|
275 |
||
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
276 |
// Update/Initialize System properties after JDK version number is known |
6961
a32b2fc66321
6988363: Rebrand vm vendor property settings (jdk7 only)
zgu
parents:
6475
diff
changeset
|
277 |
void Arguments::init_version_specific_system_properties() { |
7381
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
278 |
enum { bufsz = 16 }; |
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
279 |
char buffer[bufsz]; |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
280 |
const char* spec_vendor = "Oracle Corporation"; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
281 |
uint32_t spec_version = JDK_Version::current().major_version(); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
282 |
|
33976 | 283 |
jio_snprintf(buffer, bufsz, UINT32_FORMAT, spec_version); |
7381
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
284 |
|
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
285 |
PropertyList_add(&_system_properties, |
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
286 |
new SystemProperty("java.vm.specification.vendor", spec_vendor, false)); |
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
287 |
PropertyList_add(&_system_properties, |
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
288 |
new SystemProperty("java.vm.specification.version", buffer, false)); |
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
289 |
PropertyList_add(&_system_properties, |
5d924959cd81
6981737: The java.vm.specification.version property is 1.0, seems like it should be 2.0
kamg
parents:
6972
diff
changeset
|
290 |
new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false)); |
6961
a32b2fc66321
6988363: Rebrand vm vendor property settings (jdk7 only)
zgu
parents:
6475
diff
changeset
|
291 |
} |
a32b2fc66321
6988363: Rebrand vm vendor property settings (jdk7 only)
zgu
parents:
6475
diff
changeset
|
292 |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
293 |
/* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
294 |
* -XX argument processing: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
295 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
296 |
* -XX arguments are defined in several places, such as: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
297 |
* globals.hpp, globals_<cpu>.hpp, globals_<os>.hpp, <compiler>_globals.hpp, or <gc>_globals.hpp. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
298 |
* -XX arguments are parsed in parse_argument(). |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
299 |
* -XX argument bounds checking is done in check_vm_args_consistency(). |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
300 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
301 |
* Over time -XX arguments may change. There are mechanisms to handle common cases: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
302 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
303 |
* ALIASED: An option that is simply another name for another option. This is often |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
304 |
* part of the process of deprecating a flag, but not all aliases need |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
305 |
* to be deprecated. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
306 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
307 |
* Create an alias for an option by adding the old and new option names to the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
308 |
* "aliased_jvm_flags" table. Delete the old variable from globals.hpp (etc). |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
309 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
310 |
* DEPRECATED: An option that is supported, but a warning is printed to let the user know that |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
311 |
* support may be removed in the future. Both regular and aliased options may be |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
312 |
* deprecated. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
313 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
314 |
* Add a deprecation warning for an option (or alias) by adding an entry in the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
315 |
* "special_jvm_flags" table and setting the "deprecated_in" field. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
316 |
* Often an option "deprecated" in one major release will |
46655
d5ecb8ef2b93
8140284: Deprecate -XX:+UnsyncloadClass and -XX:+MustCallLoadClassInternal
hseigel
parents:
46633
diff
changeset
|
317 |
* be made "obsolete" in the next. In this case the entry should also have its |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
318 |
* "obsolete_in" field set. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
319 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
320 |
* OBSOLETE: An option that has been removed (and deleted from globals.hpp), but is still accepted |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
321 |
* on the command line. A warning is printed to let the user know that option might not |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
322 |
* be accepted in the future. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
323 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
324 |
* Add an obsolete warning for an option by adding an entry in the "special_jvm_flags" |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
325 |
* table and setting the "obsolete_in" field. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
326 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
327 |
* EXPIRED: A deprecated or obsolete option that has an "accept_until" version less than or equal |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
328 |
* to the current JDK version. The system will flatly refuse to admit the existence of |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
329 |
* the flag. This allows a flag to die automatically over JDK releases. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
330 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
331 |
* Note that manual cleanup of expired options should be done at major JDK version upgrades: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
332 |
* - Newly expired options should be removed from the special_jvm_flags and aliased_jvm_flags tables. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
333 |
* - Newly obsolete or expired deprecated options should have their global variable |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
334 |
* definitions removed (from globals.hpp, etc) and related implementations removed. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
335 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
336 |
* Recommended approach for removing options: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
337 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
338 |
* To remove options commonly used by customers (e.g. product, commercial -XX options), use |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
339 |
* the 3-step model adding major release numbers to the deprecate, obsolete and expire columns. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
340 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
341 |
* To remove internal options (e.g. diagnostic, experimental, develop options), use |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
342 |
* a 2-step model adding major release numbers to the obsolete and expire columns. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
343 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
344 |
* To change the name of an option, use the alias table as well as a 2-step |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
345 |
* model adding major release numbers to the deprecate and expire columns. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
346 |
* Think twice about aliasing commonly used customer options. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
347 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
348 |
* There are times when it is appropriate to leave a future release number as undefined. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
349 |
* |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
350 |
* Tests: Aliases should be tested in VMAliasOptions.java. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
351 |
* Deprecated options should be tested in VMDeprecatedOptions.java. |
950 | 352 |
*/ |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
353 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
354 |
// The special_jvm_flags table declares options that are being deprecated and/or obsoleted. The |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
355 |
// "deprecated_in" or "obsolete_in" fields may be set to "undefined", but not both. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
356 |
// When the JDK version reaches 'deprecated_in' limit, the JVM will process this flag on |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
357 |
// the command-line as usual, but will issue a warning. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
358 |
// When the JDK version reaches 'obsolete_in' limit, the JVM will continue accepting this flag on |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
359 |
// the command-line, while issuing a warning and ignoring the flag value. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
360 |
// Once the JDK version reaches 'expired_in' limit, the JVM will flatly refuse to admit the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
361 |
// existence of the flag. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
362 |
// |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
363 |
// MANUAL CLEANUP ON JDK VERSION UPDATES: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
364 |
// This table ensures that the handling of options will update automatically when the JDK |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
365 |
// version is incremented, but the source code needs to be cleanup up manually: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
366 |
// - As "deprecated" options age into "obsolete" or "expired" options, the associated "globals" |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
367 |
// variable should be removed, as well as users of the variable. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
368 |
// - As "deprecated" options age into "obsolete" options, move the entry into the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
369 |
// "Obsolete Flags" section of the table. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
370 |
// - All expired options should be removed from the table. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
371 |
static SpecialFlag const special_jvm_flags[] = { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
372 |
// -------------- Deprecated Flags -------------- |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
373 |
// --- Non-alias flags - sorted by obsolete_in then expired_in: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
374 |
{ "MaxGCMinorPauseMillis", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, |
44741
c5de7263722b
8179013: Deprecate the Concurrent Mark Sweep (CMS) Garbage Collector
ehelin
parents:
44327
diff
changeset
|
375 |
{ "UseConcMarkSweepGC", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() }, |
47572
552a97e8edad
8185062: Set AssumeMP to true and deprecate the flag
dholmes
parents:
47216
diff
changeset
|
376 |
{ "AssumeMP", JDK_Version::jdk(10),JDK_Version::undefined(), JDK_Version::undefined() }, |
46713
97900a4c5ff4
8180929: Deprecate -XX:+/-MonitorInUseLists option
rkennke
parents:
46705
diff
changeset
|
377 |
{ "MonitorInUseLists", JDK_Version::jdk(10),JDK_Version::undefined(), JDK_Version::undefined() }, |
47100
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
378 |
{ "MaxRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
379 |
{ "MinRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
380 |
{ "InitialRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, |
47821
0cd18aa4f7b6
8187809: UseMembar should be set true and deprecate the flag
rehn
parents:
47811
diff
changeset
|
381 |
{ "UseMembar", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, |
47883
acda08206310
8190925: Deprecate FastTLABRefill and set default off
rehn
parents:
47881
diff
changeset
|
382 |
{ "FastTLABRefill", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, |
47992 | 383 |
{ "SafepointSpinBeforeYield", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, |
47993 | 384 |
{ "DeferThrSuspendLoopCount", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, |
47994 | 385 |
{ "DeferPollingPageLoopCount", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, |
47903
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
386 |
{ "UseCGroupMemoryLimitForHeap", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::jdk(11) }, |
47776
52e85a3fa0ab
8187347: Do not abort CDS archive creation when some classes are unverifiable
ccheung
parents:
47765
diff
changeset
|
387 |
{ "IgnoreUnverifiableClassesDuringDump", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, |
48015
d5bb6637c785
8191042: Deprecate VM option CheckEndorsedAndExtDirs
iklam
parents:
47994
diff
changeset
|
388 |
{ "CheckEndorsedAndExtDirs", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
389 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
390 |
// --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in: |
46655
d5ecb8ef2b93
8140284: Deprecate -XX:+UnsyncloadClass and -XX:+MustCallLoadClassInternal
hseigel
parents:
46633
diff
changeset
|
391 |
{ "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() }, |
d5ecb8ef2b93
8140284: Deprecate -XX:+UnsyncloadClass and -XX:+MustCallLoadClassInternal
hseigel
parents:
46633
diff
changeset
|
392 |
{ "CreateMinidumpOnCrash", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() }, |
d5ecb8ef2b93
8140284: Deprecate -XX:+UnsyncloadClass and -XX:+MustCallLoadClassInternal
hseigel
parents:
46633
diff
changeset
|
393 |
{ "MustCallLoadClassInternal", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, |
d5ecb8ef2b93
8140284: Deprecate -XX:+UnsyncloadClass and -XX:+MustCallLoadClassInternal
hseigel
parents:
46633
diff
changeset
|
394 |
{ "UnsyncloadClass", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
395 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
396 |
// -------------- Obsolete Flags - sorted by expired_in -------------- |
43605
07baf498d588
8173421: Obsolete and expired flags for JDK 10 need to be removed and related tests updated
dholmes
parents:
42903
diff
changeset
|
397 |
{ "ConvertSleepToYield", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) }, |
07baf498d588
8173421: Obsolete and expired flags for JDK 10 need to be removed and related tests updated
dholmes
parents:
42903
diff
changeset
|
398 |
{ "ConvertYieldToSleep", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) }, |
07baf498d588
8173421: Obsolete and expired flags for JDK 10 need to be removed and related tests updated
dholmes
parents:
42903
diff
changeset
|
399 |
{ "MinSleepInterval", JDK_Version::jdk(9), JDK_Version::jdk(10), JDK_Version::jdk(11) }, |
07baf498d588
8173421: Obsolete and expired flags for JDK 10 need to be removed and related tests updated
dholmes
parents:
42903
diff
changeset
|
400 |
{ "PermSize", JDK_Version::undefined(), JDK_Version::jdk(8), JDK_Version::undefined() }, |
07baf498d588
8173421: Obsolete and expired flags for JDK 10 need to be removed and related tests updated
dholmes
parents:
42903
diff
changeset
|
401 |
{ "MaxPermSize", JDK_Version::undefined(), JDK_Version::jdk(8), JDK_Version::undefined() }, |
47811
d76a6042f5d7
8186778: Make obsolete VM options for shared region size control
iklam
parents:
47801
diff
changeset
|
402 |
{ "SharedReadWriteSize", JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() }, |
d76a6042f5d7
8186778: Make obsolete VM options for shared region size control
iklam
parents:
47801
diff
changeset
|
403 |
{ "SharedReadOnlySize", JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() }, |
d76a6042f5d7
8186778: Make obsolete VM options for shared region size control
iklam
parents:
47801
diff
changeset
|
404 |
{ "SharedMiscDataSize", JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() }, |
d76a6042f5d7
8186778: Make obsolete VM options for shared region size control
iklam
parents:
47801
diff
changeset
|
405 |
{ "SharedMiscCodeSize", JDK_Version::undefined(), JDK_Version::jdk(10), JDK_Version::undefined() }, |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
406 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
407 |
#ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
408 |
{ "dep > obs", JDK_Version::jdk(9), JDK_Version::jdk(8), JDK_Version::undefined() }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
409 |
{ "dep > exp ", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::jdk(8) }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
410 |
{ "obs > exp ", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(8) }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
411 |
{ "not deprecated or obsolete", JDK_Version::undefined(), JDK_Version::undefined(), JDK_Version::jdk(9) }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
412 |
{ "dup option", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
413 |
{ "dup option", JDK_Version::jdk(9), JDK_Version::undefined(), JDK_Version::undefined() }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
414 |
{ "BytecodeVerificationRemote", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::undefined() }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
415 |
#endif |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
416 |
|
950 | 417 |
{ NULL, JDK_Version(0), JDK_Version(0) } |
418 |
}; |
|
419 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
420 |
// Flags that are aliases for other flags. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
421 |
typedef struct { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
422 |
const char* alias_name; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
423 |
const char* real_name; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
424 |
} AliasedFlag; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
425 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
426 |
static AliasedFlag const aliased_jvm_flags[] = { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
427 |
{ "DefaultMaxRAMFraction", "MaxRAMFraction" }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
428 |
{ "CreateMinidumpOnCrash", "CreateCoredumpOnCrash" }, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
429 |
{ NULL, NULL} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
430 |
}; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
431 |
|
37428
6e724f3d488b
8152896: Convert PrintCompressedOopsMode to Unified Logging
rprotacio
parents:
37261
diff
changeset
|
432 |
// NOTE: A compatibility request will be necessary for each alias to be removed. |
35489 | 433 |
static AliasedLoggingFlag const aliased_logging_flags[] = { |
37428
6e724f3d488b
8152896: Convert PrintCompressedOopsMode to Unified Logging
rprotacio
parents:
37261
diff
changeset
|
434 |
{ "PrintCompressedOopsMode", LogLevel::Info, true, LOG_TAGS(gc, heap, coops) }, |
46522
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
46458
diff
changeset
|
435 |
{ "PrintSharedSpaces", LogLevel::Info, true, LOG_TAGS(cds) }, |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
436 |
{ "TraceBiasedLocking", LogLevel::Info, true, LOG_TAGS(biasedlocking) }, |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
437 |
{ "TraceClassLoading", LogLevel::Info, true, LOG_TAGS(class, load) }, |
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
438 |
{ "TraceClassLoadingPreorder", LogLevel::Debug, true, LOG_TAGS(class, preorder) }, |
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
439 |
{ "TraceClassPaths", LogLevel::Info, true, LOG_TAGS(class, path) }, |
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
440 |
{ "TraceClassResolution", LogLevel::Debug, true, LOG_TAGS(class, resolve) }, |
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
441 |
{ "TraceClassUnloading", LogLevel::Info, true, LOG_TAGS(class, unload) }, |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
442 |
{ "TraceExceptions", LogLevel::Info, true, LOG_TAGS(exceptions) }, |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
443 |
{ "TraceLoaderConstraints", LogLevel::Info, true, LOG_TAGS(class, loader, constraints) }, |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
444 |
{ "TraceMonitorInflation", LogLevel::Debug, true, LOG_TAGS(monitorinflation) }, |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
445 |
{ "TraceSafepointCleanupTime", LogLevel::Info, true, LOG_TAGS(safepoint, cleanup) }, |
37993 | 446 |
{ "TraceJVMTIObjectTagging", LogLevel::Debug, true, LOG_TAGS(jvmti, objecttagging) }, |
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
447 |
{ "TraceRedefineClasses", LogLevel::Info, false, LOG_TAGS(redefine, class) }, |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
448 |
{ NULL, LogLevel::Off, false, LOG_TAGS(_NO_TAG) } |
35171
cf7d5a1d0662
8145153: Convert TraceMonitorInflation to Unified Logging
rprotacio
parents:
35071
diff
changeset
|
449 |
}; |
cf7d5a1d0662
8145153: Convert TraceMonitorInflation to Unified Logging
rprotacio
parents:
35071
diff
changeset
|
450 |
|
37173
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
451 |
#ifndef PRODUCT |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
452 |
// These options are removed in jdk9. Remove this code for jdk10. |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
453 |
static AliasedFlag const removed_develop_logging_flags[] = { |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
454 |
{ "TraceClassInitialization", "-Xlog:class+init" }, |
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
455 |
{ "TraceClassLoaderData", "-Xlog:class+loader+data" }, |
37173
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
456 |
{ "TraceDefaultMethods", "-Xlog:defaultmethods=debug" }, |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
457 |
{ "TraceItables", "-Xlog:itables=debug" }, |
37203
90eabed33a6c
8150084: Convert TraceMonitorMismatch to Unified Logging.
mockner
parents:
37179
diff
changeset
|
458 |
{ "TraceMonitorMismatch", "-Xlog:monitormismatch=info" }, |
37173
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
459 |
{ "TraceSafepoint", "-Xlog:safepoint=debug" }, |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
460 |
{ "TraceStartupTime", "-Xlog:startuptime" }, |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
461 |
{ "TraceVMOperation", "-Xlog:vmoperation=debug" }, |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
462 |
{ "PrintVtables", "-Xlog:vtables=debug" }, |
37261
659ed5b20b48
8153026: Change logging tag 'verboseverification' to 'verification'
rprotacio
parents:
37253
diff
changeset
|
463 |
{ "VerboseVerification", "-Xlog:verification" }, |
37173
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
464 |
{ NULL, NULL } |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
465 |
}; |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
466 |
#endif //PRODUCT |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
467 |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
468 |
// Return true if "v" is less than "other", where "other" may be "undefined". |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
469 |
static bool version_less_than(JDK_Version v, JDK_Version other) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
470 |
assert(!v.is_undefined(), "must be defined"); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
471 |
if (!other.is_undefined() && v.compare(other) >= 0) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
472 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
473 |
} else { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
474 |
return true; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
475 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
476 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
477 |
|
41708
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
478 |
extern bool lookup_special_flag_ext(const char *flag_name, SpecialFlag& flag); |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
479 |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
480 |
static bool lookup_special_flag(const char *flag_name, SpecialFlag& flag) { |
41708
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
481 |
// Allow extensions to have priority |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
482 |
if (lookup_special_flag_ext(flag_name, flag)) { |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
483 |
return true; |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
484 |
} |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
485 |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
486 |
for (size_t i = 0; special_jvm_flags[i].name != NULL; i++) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
487 |
if ((strcmp(special_jvm_flags[i].name, flag_name) == 0)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
488 |
flag = special_jvm_flags[i]; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
489 |
return true; |
1 | 490 |
} |
491 |
} |
|
492 |
return false; |
|
493 |
} |
|
494 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
495 |
bool Arguments::is_obsolete_flag(const char *flag_name, JDK_Version* version) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
496 |
assert(version != NULL, "Must provide a version buffer"); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
497 |
SpecialFlag flag; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
498 |
if (lookup_special_flag(flag_name, flag)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
499 |
if (!flag.obsolete_in.is_undefined()) { |
48025
6bc1de3b8c59
8191707: Options with invalid values are incorrectly treated as obsolete and ignored
dholmes
parents:
48015
diff
changeset
|
500 |
if (!version_less_than(JDK_Version::current(), flag.obsolete_in)) { |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
501 |
*version = flag.obsolete_in; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
502 |
return true; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
503 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
504 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
505 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
506 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
507 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
508 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
509 |
int Arguments::is_deprecated_flag(const char *flag_name, JDK_Version* version) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
510 |
assert(version != NULL, "Must provide a version buffer"); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
511 |
SpecialFlag flag; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
512 |
if (lookup_special_flag(flag_name, flag)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
513 |
if (!flag.deprecated_in.is_undefined()) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
514 |
if (version_less_than(JDK_Version::current(), flag.obsolete_in) && |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
515 |
version_less_than(JDK_Version::current(), flag.expired_in)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
516 |
*version = flag.deprecated_in; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
517 |
return 1; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
518 |
} else { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
519 |
return -1; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
520 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
521 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
522 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
523 |
return 0; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
524 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
525 |
|
37173
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
526 |
#ifndef PRODUCT |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
527 |
const char* Arguments::removed_develop_logging_flag_name(const char* name){ |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
528 |
for (size_t i = 0; removed_develop_logging_flags[i].alias_name != NULL; i++) { |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
529 |
const AliasedFlag& flag = removed_develop_logging_flags[i]; |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
530 |
if (strcmp(flag.alias_name, name) == 0) { |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
531 |
return flag.real_name; |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
532 |
} |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
533 |
} |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
534 |
return NULL; |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
535 |
} |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
536 |
#endif // PRODUCT |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
537 |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
538 |
const char* Arguments::real_flag_name(const char *flag_name) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
539 |
for (size_t i = 0; aliased_jvm_flags[i].alias_name != NULL; i++) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
540 |
const AliasedFlag& flag_status = aliased_jvm_flags[i]; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
541 |
if (strcmp(flag_status.alias_name, flag_name) == 0) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
542 |
return flag_status.real_name; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
543 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
544 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
545 |
return flag_name; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
546 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
547 |
|
34174
4db2fb26dc49
8140424: don't prefix developer and notproduct flag variables with CONST_ in product builds
twisti
parents:
33632
diff
changeset
|
548 |
#ifdef ASSERT |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
549 |
static bool lookup_special_flag(const char *flag_name, size_t skip_index) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
550 |
for (size_t i = 0; special_jvm_flags[i].name != NULL; i++) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
551 |
if ((i != skip_index) && (strcmp(special_jvm_flags[i].name, flag_name) == 0)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
552 |
return true; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
553 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
554 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
555 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
556 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
557 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
558 |
static bool verify_special_jvm_flags() { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
559 |
bool success = true; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
560 |
for (size_t i = 0; special_jvm_flags[i].name != NULL; i++) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
561 |
const SpecialFlag& flag = special_jvm_flags[i]; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
562 |
if (lookup_special_flag(flag.name, i)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
563 |
warning("Duplicate special flag declaration \"%s\"", flag.name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
564 |
success = false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
565 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
566 |
if (flag.deprecated_in.is_undefined() && |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
567 |
flag.obsolete_in.is_undefined()) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
568 |
warning("Special flag entry \"%s\" must declare version deprecated and/or obsoleted in.", flag.name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
569 |
success = false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
570 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
571 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
572 |
if (!flag.deprecated_in.is_undefined()) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
573 |
if (!version_less_than(flag.deprecated_in, flag.obsolete_in)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
574 |
warning("Special flag entry \"%s\" must be deprecated before obsoleted.", flag.name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
575 |
success = false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
576 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
577 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
578 |
if (!version_less_than(flag.deprecated_in, flag.expired_in)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
579 |
warning("Special flag entry \"%s\" must be deprecated before expired.", flag.name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
580 |
success = false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
581 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
582 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
583 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
584 |
if (!flag.obsolete_in.is_undefined()) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
585 |
if (!version_less_than(flag.obsolete_in, flag.expired_in)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
586 |
warning("Special flag entry \"%s\" must be obsoleted before expired.", flag.name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
587 |
success = false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
588 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
589 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
590 |
// if flag has become obsolete it should not have a "globals" flag defined anymore. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
591 |
if (!version_less_than(JDK_Version::current(), flag.obsolete_in)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
592 |
if (Flag::find_flag(flag.name) != NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
593 |
warning("Global variable for obsolete special flag entry \"%s\" should be removed", flag.name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
594 |
success = false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
595 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
596 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
597 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
598 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
599 |
if (!flag.expired_in.is_undefined()) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
600 |
// if flag has become expired it should not have a "globals" flag defined anymore. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
601 |
if (!version_less_than(JDK_Version::current(), flag.expired_in)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
602 |
if (Flag::find_flag(flag.name) != NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
603 |
warning("Global variable for expired flag entry \"%s\" should be removed", flag.name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
604 |
success = false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
605 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
606 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
607 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
608 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
609 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
610 |
return success; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
611 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
612 |
#endif |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
613 |
|
38195 | 614 |
// Parses a size specification string. |
615 |
bool Arguments::atojulong(const char *s, julong* result) { |
|
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
616 |
julong n = 0; |
39621
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
617 |
|
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
618 |
// First char must be a digit. Don't allow negative numbers or leading spaces. |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
619 |
if (!isdigit(*s)) { |
1 | 620 |
return false; |
621 |
} |
|
39621
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
622 |
|
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
623 |
bool is_hex = (s[0] == '0' && (s[1] == 'x' || s[1] == 'X')); |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
624 |
char* remainder; |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
625 |
errno = 0; |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
626 |
n = strtoull(s, &remainder, (is_hex ? 16 : 10)); |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
627 |
if (errno != 0) { |
1 | 628 |
return false; |
629 |
} |
|
39621
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
630 |
|
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
631 |
// Fail if no number was read at all or if the remainder contains more than a single non-digit character. |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
632 |
if (remainder == s || strlen(remainder) > 1) { |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
633 |
return false; |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
634 |
} |
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
635 |
|
b475d96f8008
8159695: Arguments::atojulong() fails to detect overflows
mlarsson
parents:
38637
diff
changeset
|
636 |
switch (*remainder) { |
1 | 637 |
case 'T': case 't': |
638 |
*result = n * G * K; |
|
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
639 |
// Check for overflow. |
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
640 |
if (*result/((julong)G * K) != n) return false; |
1 | 641 |
return true; |
642 |
case 'G': case 'g': |
|
643 |
*result = n * G; |
|
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
644 |
if (*result/G != n) return false; |
1 | 645 |
return true; |
646 |
case 'M': case 'm': |
|
647 |
*result = n * M; |
|
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
648 |
if (*result/M != n) return false; |
1 | 649 |
return true; |
650 |
case 'K': case 'k': |
|
651 |
*result = n * K; |
|
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
652 |
if (*result/K != n) return false; |
1 | 653 |
return true; |
654 |
case '\0': |
|
655 |
*result = n; |
|
656 |
return true; |
|
657 |
default: |
|
658 |
return false; |
|
659 |
} |
|
660 |
} |
|
661 |
||
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
662 |
Arguments::ArgsRange Arguments::check_memory_size(julong size, julong min_size, julong max_size) { |
1 | 663 |
if (size < min_size) return arg_too_small; |
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
664 |
if (size > max_size) return arg_too_big; |
1 | 665 |
return arg_in_range; |
666 |
} |
|
667 |
||
668 |
// Describe an argument out of range error |
|
669 |
void Arguments::describe_range_error(ArgsRange errcode) { |
|
670 |
switch(errcode) { |
|
671 |
case arg_too_big: |
|
672 |
jio_fprintf(defaultStream::error_stream(), |
|
673 |
"The specified size exceeds the maximum " |
|
674 |
"representable size.\n"); |
|
675 |
break; |
|
676 |
case arg_too_small: |
|
677 |
case arg_unreadable: |
|
678 |
case arg_in_range: |
|
679 |
// do nothing for now |
|
680 |
break; |
|
681 |
default: |
|
682 |
ShouldNotReachHere(); |
|
683 |
} |
|
684 |
} |
|
685 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
686 |
static bool set_bool_flag(const char* name, bool value, Flag::Flags origin) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
687 |
if (CommandLineFlags::boolAtPut(name, &value, origin) == Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
688 |
return true; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
689 |
} else { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
690 |
return false; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
691 |
} |
1 | 692 |
} |
693 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
694 |
static bool set_fp_numeric_flag(const char* name, char* value, Flag::Flags origin) { |
33144
c56850e328fc
8134995: [REDO] GC: implement ranges (optionally constraints) for those flags that have them missing
sangheki
parents:
33113
diff
changeset
|
695 |
char* end; |
c56850e328fc
8134995: [REDO] GC: implement ranges (optionally constraints) for those flags that have them missing
sangheki
parents:
33113
diff
changeset
|
696 |
errno = 0; |
c56850e328fc
8134995: [REDO] GC: implement ranges (optionally constraints) for those flags that have them missing
sangheki
parents:
33113
diff
changeset
|
697 |
double v = strtod(value, &end); |
c56850e328fc
8134995: [REDO] GC: implement ranges (optionally constraints) for those flags that have them missing
sangheki
parents:
33113
diff
changeset
|
698 |
if ((errno != 0) || (*end != 0)) { |
1 | 699 |
return false; |
700 |
} |
|
701 |
||
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
702 |
if (CommandLineFlags::doubleAtPut(name, &v, origin) == Flag::SUCCESS) { |
1 | 703 |
return true; |
704 |
} |
|
705 |
return false; |
|
706 |
} |
|
707 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
708 |
static bool set_numeric_flag(const char* name, char* value, Flag::Flags origin) { |
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
709 |
julong v; |
31236 | 710 |
int int_v; |
1 | 711 |
intx intx_v; |
712 |
bool is_neg = false; |
|
33775
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
713 |
Flag* result = Flag::find_flag(name, strlen(name)); |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
714 |
|
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
715 |
if (result == NULL) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
716 |
return false; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
717 |
} |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
718 |
|
38195 | 719 |
// Check the sign first since atojulong() parses only unsigned values. |
1 | 720 |
if (*value == '-') { |
33775
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
721 |
if (!result->is_intx() && !result->is_int()) { |
1 | 722 |
return false; |
723 |
} |
|
724 |
value++; |
|
725 |
is_neg = true; |
|
726 |
} |
|
38195 | 727 |
if (!Arguments::atojulong(value, &v)) { |
1 | 728 |
return false; |
729 |
} |
|
33775
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
730 |
if (result->is_int()) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
731 |
int_v = (int) v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
732 |
if (is_neg) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
733 |
int_v = -int_v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
734 |
} |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
735 |
return CommandLineFlags::intAtPut(result, &int_v, origin) == Flag::SUCCESS; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
736 |
} else if (result->is_uint()) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
737 |
uint uint_v = (uint) v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
738 |
return CommandLineFlags::uintAtPut(result, &uint_v, origin) == Flag::SUCCESS; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
739 |
} else if (result->is_intx()) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
740 |
intx_v = (intx) v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
741 |
if (is_neg) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
742 |
intx_v = -intx_v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
743 |
} |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
744 |
return CommandLineFlags::intxAtPut(result, &intx_v, origin) == Flag::SUCCESS; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
745 |
} else if (result->is_uintx()) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
746 |
uintx uintx_v = (uintx) v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
747 |
return CommandLineFlags::uintxAtPut(result, &uintx_v, origin) == Flag::SUCCESS; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
748 |
} else if (result->is_uint64_t()) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
749 |
uint64_t uint64_t_v = (uint64_t) v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
750 |
return CommandLineFlags::uint64_tAtPut(result, &uint64_t_v, origin) == Flag::SUCCESS; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
751 |
} else if (result->is_size_t()) { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
752 |
size_t size_t_v = (size_t) v; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
753 |
return CommandLineFlags::size_tAtPut(result, &size_t_v, origin) == Flag::SUCCESS; |
46377
e2660702788f
8178364: Command-line flags of type double should accept integer values
pliden
parents:
46370
diff
changeset
|
754 |
} else if (result->is_double()) { |
e2660702788f
8178364: Command-line flags of type double should accept integer values
pliden
parents:
46370
diff
changeset
|
755 |
double double_v = (double) v; |
e2660702788f
8178364: Command-line flags of type double should accept integer values
pliden
parents:
46370
diff
changeset
|
756 |
return CommandLineFlags::doubleAtPut(result, &double_v, origin) == Flag::SUCCESS; |
33775
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
757 |
} else { |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
758 |
return false; |
3ae47fa978ea
8139765: set_numeric_flag can call Flag::find_flag to determine the flag type
ddmitriev
parents:
33729
diff
changeset
|
759 |
} |
1 | 760 |
} |
761 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
762 |
static bool set_string_flag(const char* name, const char* value, Flag::Flags origin) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
763 |
if (CommandLineFlags::ccstrAtPut(name, &value, origin) != Flag::SUCCESS) return false; |
1 | 764 |
// Contract: CommandLineFlags always returns a pointer that needs freeing. |
27880
afb974a04396
8060074: os::free() takes MemoryTrackingLevel but doesn't need it
coleenp
parents:
27666
diff
changeset
|
765 |
FREE_C_HEAP_ARRAY(char, value); |
1 | 766 |
return true; |
767 |
} |
|
768 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
769 |
static bool append_to_string_flag(const char* name, const char* new_value, Flag::Flags origin) { |
1 | 770 |
const char* old_value = ""; |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
771 |
if (CommandLineFlags::ccstrAt(name, &old_value) != Flag::SUCCESS) return false; |
1 | 772 |
size_t old_len = old_value != NULL ? strlen(old_value) : 0; |
773 |
size_t new_len = strlen(new_value); |
|
774 |
const char* value; |
|
775 |
char* free_this_too = NULL; |
|
776 |
if (old_len == 0) { |
|
777 |
value = new_value; |
|
778 |
} else if (new_len == 0) { |
|
779 |
value = old_value; |
|
780 |
} else { |
|
41540 | 781 |
size_t length = old_len + 1 + new_len + 1; |
782 |
char* buf = NEW_C_HEAP_ARRAY(char, length, mtArguments); |
|
1 | 783 |
// each new setting adds another LINE to the switch: |
41540 | 784 |
jio_snprintf(buf, length, "%s\n%s", old_value, new_value); |
1 | 785 |
value = buf; |
786 |
free_this_too = buf; |
|
787 |
} |
|
788 |
(void) CommandLineFlags::ccstrAtPut(name, &value, origin); |
|
789 |
// CommandLineFlags always returns a pointer that needs freeing. |
|
27880
afb974a04396
8060074: os::free() takes MemoryTrackingLevel but doesn't need it
coleenp
parents:
27666
diff
changeset
|
790 |
FREE_C_HEAP_ARRAY(char, value); |
1 | 791 |
if (free_this_too != NULL) { |
792 |
// CommandLineFlags made its own copy, so I must delete my own temp. buffer. |
|
27880
afb974a04396
8060074: os::free() takes MemoryTrackingLevel but doesn't need it
coleenp
parents:
27666
diff
changeset
|
793 |
FREE_C_HEAP_ARRAY(char, free_this_too); |
1 | 794 |
} |
795 |
return true; |
|
796 |
} |
|
797 |
||
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
798 |
const char* Arguments::handle_aliases_and_deprecation(const char* arg, bool warn) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
799 |
const char* real_name = real_flag_name(arg); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
800 |
JDK_Version since = JDK_Version(); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
801 |
switch (is_deprecated_flag(arg, &since)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
802 |
case -1: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
803 |
return NULL; // obsolete or expired, don't process normally |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
804 |
case 0: |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
805 |
return real_name; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
806 |
case 1: { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
807 |
if (warn) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
808 |
char version[256]; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
809 |
since.to_string(version, sizeof(version)); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
810 |
if (real_name != arg) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
811 |
warning("Option %s was deprecated in version %s and will likely be removed in a future release. Use option %s instead.", |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
812 |
arg, version, real_name); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
813 |
} else { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
814 |
warning("Option %s was deprecated in version %s and will likely be removed in a future release.", |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
815 |
arg, version); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
816 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
817 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
818 |
return real_name; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
819 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
820 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
821 |
ShouldNotReachHere(); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
822 |
return NULL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
823 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
824 |
|
37216
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
825 |
void log_deprecated_flag(const char* name, bool on, AliasedLoggingFlag alf) { |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
826 |
LogTagType tagSet[] = {alf.tag0, alf.tag1, alf.tag2, alf.tag3, alf.tag4, alf.tag5}; |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
827 |
// Set tagset string buffer at max size of 256, large enough for any alias tagset |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
828 |
const int max_tagset_size = 256; |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
829 |
int max_tagset_len = max_tagset_size - 1; |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
830 |
char tagset_buffer[max_tagset_size]; |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
831 |
tagset_buffer[0] = '\0'; |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
832 |
|
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
833 |
// Write tag-set for aliased logging option, in string list form |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
834 |
int max_tags = sizeof(tagSet)/sizeof(tagSet[0]); |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
835 |
for (int i = 0; i < max_tags && tagSet[i] != LogTag::__NO_TAG; i++) { |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
836 |
if (i > 0) { |
37990
2384dd69a2da
8154235: Using deprecated flags converted to UL shows wrong hint
rehn
parents:
37510
diff
changeset
|
837 |
strncat(tagset_buffer, "+", max_tagset_len - strlen(tagset_buffer)); |
37216
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
838 |
} |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
839 |
strncat(tagset_buffer, LogTag::name(tagSet[i]), max_tagset_len - strlen(tagset_buffer)); |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
840 |
} |
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
841 |
if (!alf.exactMatch) { |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
842 |
strncat(tagset_buffer, "*", max_tagset_len - strlen(tagset_buffer)); |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
843 |
} |
37216
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
844 |
log_warning(arguments)("-XX:%s%s is deprecated. Will use -Xlog:%s=%s instead.", |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
845 |
(on) ? "+" : "-", |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
846 |
name, |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
847 |
tagset_buffer, |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
848 |
(on) ? LogLevel::name(alf.level) : "off"); |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
849 |
} |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
850 |
|
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
851 |
AliasedLoggingFlag Arguments::catch_logging_aliases(const char* name, bool on){ |
35489 | 852 |
for (size_t i = 0; aliased_logging_flags[i].alias_name != NULL; i++) { |
853 |
const AliasedLoggingFlag& alf = aliased_logging_flags[i]; |
|
854 |
if (strcmp(alf.alias_name, name) == 0) { |
|
37216
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
855 |
log_deprecated_flag(name, on, alf); |
35489 | 856 |
return alf; |
35171
cf7d5a1d0662
8145153: Convert TraceMonitorInflation to Unified Logging
rprotacio
parents:
35071
diff
changeset
|
857 |
} |
cf7d5a1d0662
8145153: Convert TraceMonitorInflation to Unified Logging
rprotacio
parents:
35071
diff
changeset
|
858 |
} |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
859 |
AliasedLoggingFlag a = {NULL, LogLevel::Off, false, LOG_TAGS(_NO_TAG)}; |
35489 | 860 |
return a; |
35171
cf7d5a1d0662
8145153: Convert TraceMonitorInflation to Unified Logging
rprotacio
parents:
35071
diff
changeset
|
861 |
} |
cf7d5a1d0662
8145153: Convert TraceMonitorInflation to Unified Logging
rprotacio
parents:
35071
diff
changeset
|
862 |
|
20288
e2d549f40de9
8024545: make develop and notproduct flag values available in product builds
twisti
parents:
20022
diff
changeset
|
863 |
bool Arguments::parse_argument(const char* arg, Flag::Flags origin) { |
1 | 864 |
|
865 |
// range of acceptable characters spelled out for portability reasons |
|
866 |
#define NAME_RANGE "[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]" |
|
867 |
#define BUFLEN 255 |
|
868 |
char name[BUFLEN+1]; |
|
869 |
char dummy; |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
870 |
const char* real_name; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
871 |
bool warn_if_deprecated = true; |
1 | 872 |
|
873 |
if (sscanf(arg, "-%" XSTR(BUFLEN) NAME_RANGE "%c", name, &dummy) == 1) { |
|
37216
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
874 |
AliasedLoggingFlag alf = catch_logging_aliases(name, false); |
35489 | 875 |
if (alf.alias_name != NULL){ |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
876 |
LogConfiguration::configure_stdout(LogLevel::Off, alf.exactMatch, alf.tag0, alf.tag1, alf.tag2, alf.tag3, alf.tag4, alf.tag5); |
35489 | 877 |
return true; |
878 |
} |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
879 |
real_name = handle_aliases_and_deprecation(name, warn_if_deprecated); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
880 |
if (real_name == NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
881 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
882 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
883 |
return set_bool_flag(real_name, false, origin); |
1 | 884 |
} |
885 |
if (sscanf(arg, "+%" XSTR(BUFLEN) NAME_RANGE "%c", name, &dummy) == 1) { |
|
37216
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
886 |
AliasedLoggingFlag alf = catch_logging_aliases(name, true); |
35489 | 887 |
if (alf.alias_name != NULL){ |
37094
c12f414936a1
8149995: TraceClassLoadingPreorder has been converted to Unified Logging.
mockner
parents:
37078
diff
changeset
|
888 |
LogConfiguration::configure_stdout(alf.level, alf.exactMatch, alf.tag0, alf.tag1, alf.tag2, alf.tag3, alf.tag4, alf.tag5); |
35489 | 889 |
return true; |
890 |
} |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
891 |
real_name = handle_aliases_and_deprecation(name, warn_if_deprecated); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
892 |
if (real_name == NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
893 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
894 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
895 |
return set_bool_flag(real_name, true, origin); |
1 | 896 |
} |
897 |
||
898 |
char punct; |
|
899 |
if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "%c", name, &punct) == 2 && punct == '=') { |
|
900 |
const char* value = strchr(arg, '=') + 1; |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
901 |
Flag* flag; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
902 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
903 |
// this scanf pattern matches both strings (handled here) and numbers (handled later)) |
38259
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
904 |
AliasedLoggingFlag alf = catch_logging_aliases(name, true); |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
905 |
if (alf.alias_name != NULL) { |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
906 |
LogConfiguration::configure_stdout(alf.level, alf.exactMatch, alf.tag0, alf.tag1, alf.tag2, alf.tag3, alf.tag4, alf.tag5); |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
907 |
return true; |
b495d1cfe673
8153535: Convert TraceRedefineClasses to Unified Logging
rehn
parents:
38207
diff
changeset
|
908 |
} |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
909 |
real_name = handle_aliases_and_deprecation(name, warn_if_deprecated); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
910 |
if (real_name == NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
911 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
912 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
913 |
flag = Flag::find_flag(real_name); |
1 | 914 |
if (flag != NULL && flag->is_ccstr()) { |
915 |
if (flag->ccstr_accumulates()) { |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
916 |
return append_to_string_flag(real_name, value, origin); |
1 | 917 |
} else { |
918 |
if (value[0] == '\0') { |
|
919 |
value = NULL; |
|
920 |
} |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
921 |
return set_string_flag(real_name, value, origin); |
1 | 922 |
} |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
923 |
} else { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
924 |
warn_if_deprecated = false; // if arg is deprecated, we've already done warning... |
1 | 925 |
} |
926 |
} |
|
927 |
||
928 |
if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE ":%c", name, &punct) == 2 && punct == '=') { |
|
929 |
const char* value = strchr(arg, '=') + 1; |
|
930 |
// -XX:Foo:=xxx will reset the string flag to the given value. |
|
931 |
if (value[0] == '\0') { |
|
932 |
value = NULL; |
|
933 |
} |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
934 |
real_name = handle_aliases_and_deprecation(name, warn_if_deprecated); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
935 |
if (real_name == NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
936 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
937 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
938 |
return set_string_flag(real_name, value, origin); |
1 | 939 |
} |
940 |
||
33144
c56850e328fc
8134995: [REDO] GC: implement ranges (optionally constraints) for those flags that have them missing
sangheki
parents:
33113
diff
changeset
|
941 |
#define SIGNED_FP_NUMBER_RANGE "[-0123456789.eE+]" |
1 | 942 |
#define SIGNED_NUMBER_RANGE "[-0123456789]" |
33144
c56850e328fc
8134995: [REDO] GC: implement ranges (optionally constraints) for those flags that have them missing
sangheki
parents:
33113
diff
changeset
|
943 |
#define NUMBER_RANGE "[0123456789eE+-]" |
1 | 944 |
char value[BUFLEN + 1]; |
945 |
char value2[BUFLEN + 1]; |
|
946 |
if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "=" "%" XSTR(BUFLEN) SIGNED_NUMBER_RANGE "." "%" XSTR(BUFLEN) NUMBER_RANGE "%c", name, value, value2, &dummy) == 3) { |
|
947 |
// Looks like a floating-point number -- try again with more lenient format string |
|
948 |
if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "=" "%" XSTR(BUFLEN) SIGNED_FP_NUMBER_RANGE "%c", name, value, &dummy) == 2) { |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
949 |
real_name = handle_aliases_and_deprecation(name, warn_if_deprecated); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
950 |
if (real_name == NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
951 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
952 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
953 |
return set_fp_numeric_flag(real_name, value, origin); |
1 | 954 |
} |
955 |
} |
|
956 |
||
24458
f0d4da9b062a
8042885: java does not take hexadecimal number as vm option
minqi
parents:
24456
diff
changeset
|
957 |
#define VALUE_RANGE "[-kmgtxKMGTX0123456789abcdefABCDEF]" |
1 | 958 |
if (sscanf(arg, "%" XSTR(BUFLEN) NAME_RANGE "=" "%" XSTR(BUFLEN) VALUE_RANGE "%c", name, value, &dummy) == 2) { |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
959 |
real_name = handle_aliases_and_deprecation(name, warn_if_deprecated); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
960 |
if (real_name == NULL) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
961 |
return false; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
962 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
963 |
return set_numeric_flag(real_name, value, origin); |
1 | 964 |
} |
965 |
||
966 |
return false; |
|
967 |
} |
|
968 |
||
969 |
void Arguments::add_string(char*** bldarray, int* count, const char* arg) { |
|
970 |
assert(bldarray != NULL, "illegal argument"); |
|
971 |
||
972 |
if (arg == NULL) { |
|
973 |
return; |
|
974 |
} |
|
975 |
||
17319
7704ecd22af4
8013574: PrintMalloc conflicts with the command line parsing
brutisso
parents:
17022
diff
changeset
|
976 |
int new_count = *count + 1; |
1 | 977 |
|
978 |
// expand the array and add arg to the last element |
|
979 |
if (*bldarray == NULL) { |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
980 |
*bldarray = NEW_C_HEAP_ARRAY(char*, new_count, mtArguments); |
1 | 981 |
} else { |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
982 |
*bldarray = REALLOC_C_HEAP_ARRAY(char*, *bldarray, new_count, mtArguments); |
1 | 983 |
} |
25949 | 984 |
(*bldarray)[*count] = os::strdup_check_oom(arg); |
17319
7704ecd22af4
8013574: PrintMalloc conflicts with the command line parsing
brutisso
parents:
17022
diff
changeset
|
985 |
*count = new_count; |
1 | 986 |
} |
987 |
||
988 |
void Arguments::build_jvm_args(const char* arg) { |
|
989 |
add_string(&_jvm_args_array, &_num_jvm_args, arg); |
|
990 |
} |
|
991 |
||
992 |
void Arguments::build_jvm_flags(const char* arg) { |
|
993 |
add_string(&_jvm_flags_array, &_num_jvm_flags, arg); |
|
994 |
} |
|
995 |
||
996 |
// utility function to return a string that concatenates all |
|
997 |
// strings in a given char** array |
|
998 |
const char* Arguments::build_resource_string(char** args, int count) { |
|
999 |
if (args == NULL || count == 0) { |
|
1000 |
return NULL; |
|
1001 |
} |
|
41540 | 1002 |
size_t length = 0; |
1003 |
for (int i = 0; i < count; i++) { |
|
1004 |
length += strlen(args[i]) + 1; // add 1 for a space or NULL terminating character |
|
1 | 1005 |
} |
1006 |
char* s = NEW_RESOURCE_ARRAY(char, length); |
|
41540 | 1007 |
char* dst = s; |
1008 |
for (int j = 0; j < count; j++) { |
|
1009 |
size_t offset = strlen(args[j]) + 1; // add 1 for a space or NULL terminating character |
|
1010 |
jio_snprintf(dst, length, "%s ", args[j]); // jio_snprintf will replace the last space character with NULL character |
|
1011 |
dst += offset; |
|
1012 |
length -= offset; |
|
1 | 1013 |
} |
1014 |
return (const char*) s; |
|
1015 |
} |
|
1016 |
||
1017 |
void Arguments::print_on(outputStream* st) { |
|
1018 |
st->print_cr("VM Arguments:"); |
|
1019 |
if (num_jvm_flags() > 0) { |
|
1020 |
st->print("jvm_flags: "); print_jvm_flags_on(st); |
|
31963
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1021 |
st->cr(); |
1 | 1022 |
} |
1023 |
if (num_jvm_args() > 0) { |
|
1024 |
st->print("jvm_args: "); print_jvm_args_on(st); |
|
31963
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1025 |
st->cr(); |
1 | 1026 |
} |
1027 |
st->print_cr("java_command: %s", java_command() ? java_command() : "<unknown>"); |
|
14117
6e2e697e310f
7053130: hs_err file does not record specified CLASSPATH
coleenp
parents:
14116
diff
changeset
|
1028 |
if (_java_class_path != NULL) { |
6e2e697e310f
7053130: hs_err file does not record specified CLASSPATH
coleenp
parents:
14116
diff
changeset
|
1029 |
char* path = _java_class_path->value(); |
6e2e697e310f
7053130: hs_err file does not record specified CLASSPATH
coleenp
parents:
14116
diff
changeset
|
1030 |
st->print_cr("java_class_path (initial): %s", strlen(path) == 0 ? "<not set>" : path ); |
6e2e697e310f
7053130: hs_err file does not record specified CLASSPATH
coleenp
parents:
14116
diff
changeset
|
1031 |
} |
1 | 1032 |
st->print_cr("Launcher Type: %s", _sun_java_launcher); |
1033 |
} |
|
1034 |
||
31963
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1035 |
void Arguments::print_summary_on(outputStream* st) { |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1036 |
// Print the command line. Environment variables that are helpful for |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1037 |
// reproducing the problem are written later in the hs_err file. |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1038 |
// flags are from setting file |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1039 |
if (num_jvm_flags() > 0) { |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1040 |
st->print_raw("Settings File: "); |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1041 |
print_jvm_flags_on(st); |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1042 |
st->cr(); |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1043 |
} |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1044 |
// args are the command line and environment variable arguments. |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1045 |
st->print_raw("Command Line: "); |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1046 |
if (num_jvm_args() > 0) { |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1047 |
print_jvm_args_on(st); |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1048 |
} |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1049 |
// this is the classfile and any arguments to the java program |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1050 |
if (java_command() != NULL) { |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1051 |
st->print("%s", java_command()); |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1052 |
} |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1053 |
st->cr(); |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1054 |
} |
641ed52732ec
8026324: hs_err improvement: Add summary section to hs_err file
coleenp
parents:
31853
diff
changeset
|
1055 |
|
1 | 1056 |
void Arguments::print_jvm_flags_on(outputStream* st) { |
1057 |
if (_num_jvm_flags > 0) { |
|
1058 |
for (int i=0; i < _num_jvm_flags; i++) { |
|
1059 |
st->print("%s ", _jvm_flags_array[i]); |
|
1060 |
} |
|
1061 |
} |
|
1062 |
} |
|
1063 |
||
1064 |
void Arguments::print_jvm_args_on(outputStream* st) { |
|
1065 |
if (_num_jvm_args > 0) { |
|
1066 |
for (int i=0; i < _num_jvm_args; i++) { |
|
1067 |
st->print("%s ", _jvm_args_array[i]); |
|
1068 |
} |
|
1069 |
} |
|
1070 |
} |
|
1071 |
||
950 | 1072 |
bool Arguments::process_argument(const char* arg, |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1073 |
jboolean ignore_unrecognized, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1074 |
Flag::Flags origin) { |
950 | 1075 |
JDK_Version since = JDK_Version(); |
1 | 1076 |
|
33592
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1077 |
if (parse_argument(arg, origin)) { |
9177 | 1078 |
return true; |
1 | 1079 |
} |
9177 | 1080 |
|
30242
5b15a65d4373
8073989: Deprecated integer options are considered as invalid instead of deprecated in Java 9
mockner
parents:
30240
diff
changeset
|
1081 |
// Determine if the flag has '+', '-', or '=' characters. |
15442
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1082 |
bool has_plus_minus = (*arg == '+' || *arg == '-'); |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1083 |
const char* const argname = has_plus_minus ? arg + 1 : arg; |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1084 |
|
15442
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1085 |
size_t arg_len; |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1086 |
const char* equal_sign = strchr(argname, '='); |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1087 |
if (equal_sign == NULL) { |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1088 |
arg_len = strlen(argname); |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1089 |
} else { |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1090 |
arg_len = equal_sign - argname; |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1091 |
} |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1092 |
|
31624
a184abca1684
8129786: Buffer overrun when passing long not existing option in JDK 9
ddmitriev
parents:
31620
diff
changeset
|
1093 |
// Only make the obsolete check for valid arguments. |
a184abca1684
8129786: Buffer overrun when passing long not existing option in JDK 9
ddmitriev
parents:
31620
diff
changeset
|
1094 |
if (arg_len <= BUFLEN) { |
a184abca1684
8129786: Buffer overrun when passing long not existing option in JDK 9
ddmitriev
parents:
31620
diff
changeset
|
1095 |
// Construct a string which consists only of the argument name without '+', '-', or '='. |
41540 | 1096 |
char stripped_argname[BUFLEN+1]; // +1 for '\0' |
1097 |
jio_snprintf(stripped_argname, arg_len+1, "%s", argname); // +1 for '\0' |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1098 |
if (is_obsolete_flag(stripped_argname, &since)) { |
31624
a184abca1684
8129786: Buffer overrun when passing long not existing option in JDK 9
ddmitriev
parents:
31620
diff
changeset
|
1099 |
char version[256]; |
a184abca1684
8129786: Buffer overrun when passing long not existing option in JDK 9
ddmitriev
parents:
31620
diff
changeset
|
1100 |
since.to_string(version, sizeof(version)); |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1101 |
warning("Ignoring option %s; support was removed in %s", stripped_argname, version); |
31624
a184abca1684
8129786: Buffer overrun when passing long not existing option in JDK 9
ddmitriev
parents:
31620
diff
changeset
|
1102 |
return true; |
a184abca1684
8129786: Buffer overrun when passing long not existing option in JDK 9
ddmitriev
parents:
31620
diff
changeset
|
1103 |
} |
37173
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1104 |
#ifndef PRODUCT |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1105 |
else { |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1106 |
const char* replacement; |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1107 |
if ((replacement = removed_develop_logging_flag_name(stripped_argname)) != NULL){ |
37216
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
1108 |
log_warning(arguments)("%s has been removed. Please use %s instead.", |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
1109 |
stripped_argname, |
5555c1f804c4
8145235: Deprecate product flags that have been converted to Unified Logging
rprotacio
parents:
37205
diff
changeset
|
1110 |
replacement); |
37173
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1111 |
return false; |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1112 |
} |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1113 |
} |
d8aea1500483
8146632: Add descriptive error messages for removed non-product logging flags.
mockner
parents:
37155
diff
changeset
|
1114 |
#endif //PRODUCT |
30242
5b15a65d4373
8073989: Deprecated integer options are considered as invalid instead of deprecated in Java 9
mockner
parents:
30240
diff
changeset
|
1115 |
} |
5b15a65d4373
8073989: Deprecated integer options are considered as invalid instead of deprecated in Java 9
mockner
parents:
30240
diff
changeset
|
1116 |
|
5b15a65d4373
8073989: Deprecated integer options are considered as invalid instead of deprecated in Java 9
mockner
parents:
30240
diff
changeset
|
1117 |
// For locked flags, report a custom error message if available. |
5b15a65d4373
8073989: Deprecated integer options are considered as invalid instead of deprecated in Java 9
mockner
parents:
30240
diff
changeset
|
1118 |
// Otherwise, report the standard unrecognized VM option. |
22518
e23c5545e376
8027314: Java should recognize Diagnostic options if -XX:+UnlockDiagnosticVMOptions is not specified and print an informative message
ccheung
parents:
21922
diff
changeset
|
1119 |
Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true, true); |
15442
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1120 |
if (found_flag != NULL) { |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1121 |
char locked_message_buf[BUFLEN]; |
33592
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1122 |
Flag::MsgType msg_type = found_flag->get_locked_message(locked_message_buf, BUFLEN); |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1123 |
if (strlen(locked_message_buf) == 0) { |
15442
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1124 |
if (found_flag->is_bool() && !has_plus_minus) { |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1125 |
jio_fprintf(defaultStream::error_stream(), |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1126 |
"Missing +/- setting for VM option '%s'\n", argname); |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1127 |
} else if (!found_flag->is_bool() && has_plus_minus) { |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1128 |
jio_fprintf(defaultStream::error_stream(), |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1129 |
"Unexpected +/- setting in VM option '%s'\n", argname); |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1130 |
} else { |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1131 |
jio_fprintf(defaultStream::error_stream(), |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1132 |
"Improperly specified VM option '%s'\n", argname); |
047acb1184df
8006298: Specifying malformed JFR options (-XX:+FlightRecorderOptions) outputs non-sensical error
hseigel
parents:
15432
diff
changeset
|
1133 |
} |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1134 |
} else { |
33592
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1135 |
#ifdef PRODUCT |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1136 |
bool mismatched = ((msg_type == Flag::NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD) || |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1137 |
(msg_type == Flag::DEVELOPER_FLAG_BUT_PRODUCT_BUILD)); |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1138 |
if (ignore_unrecognized && mismatched) { |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1139 |
return true; |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1140 |
} |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1141 |
#endif |
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1142 |
jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf); |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1143 |
} |
12498 | 1144 |
} else { |
33592
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1145 |
if (ignore_unrecognized) { |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1146 |
return true; |
ceda4a796f5d
8129855: "-XX:+IgnoreUnrecognizedVMOptions" hides out of range VM options.
gziemski
parents:
33590
diff
changeset
|
1147 |
} |
12498 | 1148 |
jio_fprintf(defaultStream::error_stream(), |
1149 |
"Unrecognized VM option '%s'\n", argname); |
|
18497 | 1150 |
Flag* fuzzy_matched = Flag::fuzzy_match((const char*)argname, arg_len, true); |
1151 |
if (fuzzy_matched != NULL) { |
|
1152 |
jio_fprintf(defaultStream::error_stream(), |
|
27659
82af5d5e777b
8060449: Obsolete command line flags accept arbitrary appendix
coleenp
parents:
27465
diff
changeset
|
1153 |
"Did you mean '%s%s%s'? ", |
18497 | 1154 |
(fuzzy_matched->is_bool()) ? "(+/-)" : "", |
20288
e2d549f40de9
8024545: make develop and notproduct flag values available in product builds
twisti
parents:
20022
diff
changeset
|
1155 |
fuzzy_matched->_name, |
18497 | 1156 |
(fuzzy_matched->is_bool()) ? "" : "=<value>"); |
1157 |
} |
|
12157
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1158 |
} |
439a7166bf0f
7144328: Improper commandlines for -XX:+-UnlockCommercialFeatures require proper warning/error messages
jmelvin
parents:
12095
diff
changeset
|
1159 |
|
9177 | 1160 |
// allow for commandline "commenting out" options like -XX:#+Verbose |
1161 |
return arg[0] == '#'; |
|
1 | 1162 |
} |
1163 |
||
1164 |
bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) { |
|
1165 |
FILE* stream = fopen(file_name, "rb"); |
|
1166 |
if (stream == NULL) { |
|
1167 |
if (should_exist) { |
|
1168 |
jio_fprintf(defaultStream::error_stream(), |
|
1169 |
"Could not open settings file %s\n", file_name); |
|
1170 |
return false; |
|
1171 |
} else { |
|
1172 |
return true; |
|
1173 |
} |
|
1174 |
} |
|
1175 |
||
1176 |
char token[1024]; |
|
1177 |
int pos = 0; |
|
1178 |
||
1179 |
bool in_white_space = true; |
|
1180 |
bool in_comment = false; |
|
1181 |
bool in_quote = false; |
|
1182 |
char quote_c = 0; |
|
1183 |
bool result = true; |
|
1184 |
||
1185 |
int c = getc(stream); |
|
14139 | 1186 |
while(c != EOF && pos < (int)(sizeof(token)-1)) { |
1 | 1187 |
if (in_white_space) { |
1188 |
if (in_comment) { |
|
1189 |
if (c == '\n') in_comment = false; |
|
1190 |
} else { |
|
1191 |
if (c == '#') in_comment = true; |
|
1192 |
else if (!isspace(c)) { |
|
1193 |
in_white_space = false; |
|
1194 |
token[pos++] = c; |
|
1195 |
} |
|
1196 |
} |
|
1197 |
} else { |
|
1198 |
if (c == '\n' || (!in_quote && isspace(c))) { |
|
1199 |
// token ends at newline, or at unquoted whitespace |
|
1200 |
// this allows a way to include spaces in string-valued options |
|
1201 |
token[pos] = '\0'; |
|
1202 |
logOption(token); |
|
20288
e2d549f40de9
8024545: make develop and notproduct flag values available in product builds
twisti
parents:
20022
diff
changeset
|
1203 |
result &= process_argument(token, ignore_unrecognized, Flag::CONFIG_FILE); |
1 | 1204 |
build_jvm_flags(token); |
1205 |
pos = 0; |
|
1206 |
in_white_space = true; |
|
1207 |
in_quote = false; |
|
1208 |
} else if (!in_quote && (c == '\'' || c == '"')) { |
|
1209 |
in_quote = true; |
|
1210 |
quote_c = c; |
|
1211 |
} else if (in_quote && (c == quote_c)) { |
|
1212 |
in_quote = false; |
|
1213 |
} else { |
|
1214 |
token[pos++] = c; |
|
1215 |
} |
|
1216 |
} |
|
1217 |
c = getc(stream); |
|
1218 |
} |
|
1219 |
if (pos > 0) { |
|
1220 |
token[pos] = '\0'; |
|
20288
e2d549f40de9
8024545: make develop and notproduct flag values available in product builds
twisti
parents:
20022
diff
changeset
|
1221 |
result &= process_argument(token, ignore_unrecognized, Flag::CONFIG_FILE); |
1 | 1222 |
build_jvm_flags(token); |
1223 |
} |
|
1224 |
fclose(stream); |
|
1225 |
return result; |
|
1226 |
} |
|
1227 |
||
1228 |
//============================================================================================================= |
|
1229 |
// Parsing of properties (-D) |
|
1230 |
||
1231 |
const char* Arguments::get_property(const char* key) { |
|
1232 |
return PropertyList_get_value(system_properties(), key); |
|
1233 |
} |
|
1234 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
1235 |
bool Arguments::add_property(const char* prop, PropertyWriteable writeable, PropertyInternal internal) { |
1 | 1236 |
const char* eq = strchr(prop, '='); |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1237 |
const char* key; |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1238 |
const char* value = ""; |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1239 |
|
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1240 |
if (eq == NULL) { |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1241 |
// property doesn't have a value, thus use passed string |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1242 |
key = prop; |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1243 |
} else { |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1244 |
// property have a value, thus extract it and save to the |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1245 |
// allocated string |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1246 |
size_t key_len = eq - prop; |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
1247 |
char* tmp_key = AllocateHeap(key_len + 1, mtArguments); |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1248 |
|
41540 | 1249 |
jio_snprintf(tmp_key, key_len + 1, "%s", prop); |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1250 |
key = tmp_key; |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1251 |
|
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1252 |
value = &prop[key_len + 1]; |
1 | 1253 |
} |
1254 |
||
1255 |
if (strcmp(key, "java.compiler") == 0) { |
|
1256 |
process_java_compiler_argument(value); |
|
7900
4c7fc6332f7e
6994753: Implement optional hook to a Java method at VM startup.
kevinw
parents:
7719
diff
changeset
|
1257 |
// Record value in Arguments, but let it get passed to Java. |
22734
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
1258 |
} else if (strcmp(key, "sun.java.launcher.is_altjvm") == 0 || |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
1259 |
strcmp(key, "sun.java.launcher.pid") == 0) { |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
1260 |
// sun.java.launcher.is_altjvm and sun.java.launcher.pid property are |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
1261 |
// private and are processed in process_sun_java_launcher_properties(); |
1 | 1262 |
// the sun.java.launcher property is passed on to the java application |
2358 | 1263 |
} else if (strcmp(key, "sun.boot.library.path") == 0) { |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
1264 |
// append is true, writable is true, internal is false |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
1265 |
PropertyList_unique_add(&_system_properties, key, value, AppendProperty, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
1266 |
WriteableProperty, ExternalProperty); |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1267 |
} else { |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1268 |
if (strcmp(key, "sun.java.command") == 0) { |
35046
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1269 |
char *old_java_command = _java_command; |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
1270 |
_java_command = os::strdup_check_oom(value, mtArguments); |
35046
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1271 |
if (old_java_command != NULL) { |
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1272 |
os::free(old_java_command); |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1273 |
} |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1274 |
} else if (strcmp(key, "java.vendor.url.bug") == 0) { |
35046
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1275 |
const char* old_java_vendor_url_bug = _java_vendor_url_bug; |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1276 |
// save it in _java_vendor_url_bug, so JVM fatal error handler can access |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1277 |
// its value without going through the property list or making a Java call. |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
1278 |
_java_vendor_url_bug = os::strdup_check_oom(value, mtArguments); |
35046
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1279 |
if (old_java_vendor_url_bug != DEFAULT_VENDOR_URL_BUG) { |
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1280 |
assert(old_java_vendor_url_bug != NULL, "_java_vendor_url_bug is NULL"); |
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1281 |
os::free((void *)old_java_vendor_url_bug); |
a5ade0cccbd4
8144197: Possible use after free in Arguments::add_property function
ddmitriev
parents:
34673
diff
changeset
|
1282 |
} |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1283 |
} |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1284 |
|
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1285 |
// Create new property and add at the end of the list |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
1286 |
PropertyList_unique_add(&_system_properties, key, value, AddProperty, writeable, internal); |
1 | 1287 |
} |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1288 |
|
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1289 |
if (key != prop) { |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1290 |
// SystemProperty copy passed value, thus free previously allocated |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1291 |
// memory |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1292 |
FreeHeap((void *)key); |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1293 |
} |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1294 |
|
1 | 1295 |
return true; |
1296 |
} |
|
1297 |
||
36508 | 1298 |
#if INCLUDE_CDS |
1299 |
void Arguments::check_unsupported_dumping_properties() { |
|
1300 |
assert(DumpSharedSpaces, "this function is only used with -Xshare:dump"); |
|
42563
3d6cb73ba7bb
8168796: relax vm options checking during CDS dump time
ccheung
parents:
41744
diff
changeset
|
1301 |
const char* unsupported_properties[] = { "jdk.module.main", |
3d6cb73ba7bb
8168796: relax vm options checking during CDS dump time
ccheung
parents:
41744
diff
changeset
|
1302 |
"jdk.module.limitmods", |
36508 | 1303 |
"jdk.module.path", |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
1304 |
"jdk.module.upgrade.path", |
42876
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42654
diff
changeset
|
1305 |
"jdk.module.patch.0" }; |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42654
diff
changeset
|
1306 |
const char* unsupported_options[] = { "-m", // cannot use at dump time |
42899
b9ae8968fce6
8171011: convert some CDS dump time warning and error messages to informational messages which will be printed with -XX:+PrintSharedSpaces
ccheung
parents:
42876
diff
changeset
|
1307 |
"--limit-modules", // ignored at dump time |
42876
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42654
diff
changeset
|
1308 |
"--module-path", // ignored at dump time |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42654
diff
changeset
|
1309 |
"--upgrade-module-path", // ignored at dump time |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42654
diff
changeset
|
1310 |
"--patch-module" // ignored at dump time |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42654
diff
changeset
|
1311 |
}; |
42563
3d6cb73ba7bb
8168796: relax vm options checking during CDS dump time
ccheung
parents:
41744
diff
changeset
|
1312 |
assert(ARRAY_SIZE(unsupported_properties) == ARRAY_SIZE(unsupported_options), "must be"); |
42899
b9ae8968fce6
8171011: convert some CDS dump time warning and error messages to informational messages which will be printed with -XX:+PrintSharedSpaces
ccheung
parents:
42876
diff
changeset
|
1313 |
// If a vm option is found in the unsupported_options array with index less than the info_idx, |
b9ae8968fce6
8171011: convert some CDS dump time warning and error messages to informational messages which will be printed with -XX:+PrintSharedSpaces
ccheung
parents:
42876
diff
changeset
|
1314 |
// vm will exit with an error message. Otherwise, it will print an informational message if |
46522
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
46458
diff
changeset
|
1315 |
// -Xlog:cds is enabled. |
42899
b9ae8968fce6
8171011: convert some CDS dump time warning and error messages to informational messages which will be printed with -XX:+PrintSharedSpaces
ccheung
parents:
42876
diff
changeset
|
1316 |
uint info_idx = 1; |
36508 | 1317 |
SystemProperty* sp = system_properties(); |
1318 |
while (sp != NULL) { |
|
42563
3d6cb73ba7bb
8168796: relax vm options checking during CDS dump time
ccheung
parents:
41744
diff
changeset
|
1319 |
for (uint i = 0; i < ARRAY_SIZE(unsupported_properties); i++) { |
36508 | 1320 |
if (strcmp(sp->key(), unsupported_properties[i]) == 0) { |
42899
b9ae8968fce6
8171011: convert some CDS dump time warning and error messages to informational messages which will be printed with -XX:+PrintSharedSpaces
ccheung
parents:
42876
diff
changeset
|
1321 |
if (i < info_idx) { |
36508 | 1322 |
vm_exit_during_initialization( |
1323 |
"Cannot use the following option when dumping the shared archive", unsupported_options[i]); |
|
42563
3d6cb73ba7bb
8168796: relax vm options checking during CDS dump time
ccheung
parents:
41744
diff
changeset
|
1324 |
} else { |
46522
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
46458
diff
changeset
|
1325 |
log_info(cds)("Info: the %s option is ignored when dumping the shared archive", |
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
46458
diff
changeset
|
1326 |
unsupported_options[i]); |
42563
3d6cb73ba7bb
8168796: relax vm options checking during CDS dump time
ccheung
parents:
41744
diff
changeset
|
1327 |
} |
36508 | 1328 |
} |
1329 |
} |
|
1330 |
sp = sp->next(); |
|
1331 |
} |
|
40013 | 1332 |
|
1333 |
// Check for an exploded module build in use with -Xshare:dump. |
|
1334 |
if (!has_jimage()) { |
|
1335 |
vm_exit_during_initialization("Dumping the shared archive is not supported with an exploded module build"); |
|
1336 |
} |
|
36508 | 1337 |
} |
1338 |
#endif |
|
1339 |
||
1 | 1340 |
//=========================================================================================================== |
1341 |
// Setting int/mixed/comp mode flags |
|
1342 |
||
1343 |
void Arguments::set_mode_flags(Mode mode) { |
|
1344 |
// Set up default values for all flags. |
|
1345 |
// If you add a flag to any of the branches below, |
|
1346 |
// add a default value for it here. |
|
1347 |
set_java_compiler(false); |
|
1348 |
_mode = mode; |
|
1349 |
||
1350 |
// Ensure Agent_OnLoad has the correct initial values. |
|
1351 |
// This may not be the final mode; mode may change later in onload phase. |
|
1352 |
PropertyList_unique_add(&_system_properties, "java.vm.info", |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
1353 |
VM_Version::vm_info_string(), AddProperty, UnwriteableProperty, ExternalProperty); |
1 | 1354 |
|
1355 |
UseInterpreter = true; |
|
1356 |
UseCompiler = true; |
|
1357 |
UseLoopCounter = true; |
|
1358 |
||
1359 |
// Default values may be platform/compiler dependent - |
|
1360 |
// use the saved values |
|
1361 |
ClipInlining = Arguments::_ClipInlining; |
|
1362 |
AlwaysCompileLoopMethods = Arguments::_AlwaysCompileLoopMethods; |
|
1363 |
UseOnStackReplacement = Arguments::_UseOnStackReplacement; |
|
1364 |
BackgroundCompilation = Arguments::_BackgroundCompilation; |
|
30201
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1365 |
if (TieredCompilation) { |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1366 |
if (FLAG_IS_DEFAULT(Tier3InvokeNotifyFreqLog)) { |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1367 |
Tier3InvokeNotifyFreqLog = Arguments::_Tier3InvokeNotifyFreqLog; |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1368 |
} |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1369 |
if (FLAG_IS_DEFAULT(Tier4InvocationThreshold)) { |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1370 |
Tier4InvocationThreshold = Arguments::_Tier4InvocationThreshold; |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1371 |
} |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
1372 |
} |
1 | 1373 |
|
1374 |
// Change from defaults based on mode |
|
1375 |
switch (mode) { |
|
1376 |
default: |
|
1377 |
ShouldNotReachHere(); |
|
1378 |
break; |
|
1379 |
case _int: |
|
1380 |
UseCompiler = false; |
|
1381 |
UseLoopCounter = false; |
|
1382 |
AlwaysCompileLoopMethods = false; |
|
1383 |
UseOnStackReplacement = false; |
|
1384 |
break; |
|
1385 |
case _mixed: |
|
1386 |
// same as default |
|
1387 |
break; |
|
1388 |
case _comp: |
|
1389 |
UseInterpreter = false; |
|
1390 |
BackgroundCompilation = false; |
|
1391 |
ClipInlining = false; |
|
11426
7dd181af6a26
7121111: -server -Xcomp -XX:+TieredCompilation does not invoke C2 compiler
iveresov
parents:
11187
diff
changeset
|
1392 |
// Be much more aggressive in tiered mode with -Xcomp and exercise C2 more. |
7dd181af6a26
7121111: -server -Xcomp -XX:+TieredCompilation does not invoke C2 compiler
iveresov
parents:
11187
diff
changeset
|
1393 |
// We will first compile a level 3 version (C1 with full profiling), then do one invocation of it and |
7dd181af6a26
7121111: -server -Xcomp -XX:+TieredCompilation does not invoke C2 compiler
iveresov
parents:
11187
diff
changeset
|
1394 |
// compile a level 4 (C2) and then continue executing it. |
7dd181af6a26
7121111: -server -Xcomp -XX:+TieredCompilation does not invoke C2 compiler
iveresov
parents:
11187
diff
changeset
|
1395 |
if (TieredCompilation) { |
7dd181af6a26
7121111: -server -Xcomp -XX:+TieredCompilation does not invoke C2 compiler
iveresov
parents:
11187
diff
changeset
|
1396 |
Tier3InvokeNotifyFreqLog = 0; |
7dd181af6a26
7121111: -server -Xcomp -XX:+TieredCompilation does not invoke C2 compiler
iveresov
parents:
11187
diff
changeset
|
1397 |
Tier4InvocationThreshold = 0; |
7dd181af6a26
7121111: -server -Xcomp -XX:+TieredCompilation does not invoke C2 compiler
iveresov
parents:
11187
diff
changeset
|
1398 |
} |
1 | 1399 |
break; |
1400 |
} |
|
1401 |
} |
|
1402 |
||
1403 |
// Conflict: required to use shared spaces (-Xshare:on), but |
|
1404 |
// incompatible command line options were chosen. |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
1405 |
static void no_shared_spaces(const char* message) { |
1 | 1406 |
if (RequireSharedSpaces) { |
1407 |
jio_fprintf(defaultStream::error_stream(), |
|
1408 |
"Class data sharing is inconsistent with other specified options.\n"); |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
1409 |
vm_exit_during_initialization("Unable to use shared archive.", message); |
1 | 1410 |
} else { |
1411 |
FLAG_SET_DEFAULT(UseSharedSpaces, false); |
|
1412 |
} |
|
1413 |
} |
|
1414 |
||
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1415 |
// Returns threshold scaled with the value of scale. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1416 |
// If scale < 0.0, threshold is returned without scaling. |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1417 |
intx Arguments::scaled_compile_threshold(intx threshold, double scale) { |
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1418 |
if (scale == 1.0 || scale < 0.0) { |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1419 |
return threshold; |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1420 |
} else { |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1421 |
return (intx)(threshold * scale); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1422 |
} |
27148
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1423 |
} |
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1424 |
|
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1425 |
// Returns freq_log scaled with the value of scale. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1426 |
// Returned values are in the range of [0, InvocationCounter::number_of_count_bits + 1]. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1427 |
// If scale < 0.0, freq_log is returned without scaling. |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1428 |
intx Arguments::scaled_freq_log(intx freq_log, double scale) { |
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1429 |
// Check if scaling is necessary or if negative value was specified. |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1430 |
if (scale == 1.0 || scale < 0.0) { |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1431 |
return freq_log; |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1432 |
} |
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1433 |
// Check values to avoid calculating log2 of 0. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1434 |
if (scale == 0.0 || freq_log == 0) { |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1435 |
return 0; |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1436 |
} |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1437 |
// Determine the maximum notification frequency value currently supported. |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1438 |
// The largest mask value that the interpreter/C1 can handle is |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1439 |
// of length InvocationCounter::number_of_count_bits. Mask values are always |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1440 |
// one bit shorter then the value of the notification frequency. Set |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1441 |
// max_freq_bits accordingly. |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1442 |
intx max_freq_bits = InvocationCounter::number_of_count_bits + 1; |
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1443 |
intx scaled_freq = scaled_compile_threshold((intx)1 << freq_log, scale); |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1444 |
if (scaled_freq == 0) { |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1445 |
// Return 0 right away to avoid calculating log2 of 0. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1446 |
return 0; |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1447 |
} else if (scaled_freq > nth_bit(max_freq_bits)) { |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1448 |
return max_freq_bits; |
27148
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1449 |
} else { |
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1450 |
return log2_intptr(scaled_freq); |
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1451 |
} |
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1452 |
} |
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1453 |
|
6453 | 1454 |
void Arguments::set_tiered_flags() { |
8667
b32929355d27
7020403: Add AdvancedCompilationPolicy for tiered
iveresov
parents:
8499
diff
changeset
|
1455 |
// With tiered, set default policy to AdvancedThresholdPolicy, which is 3. |
6453 | 1456 |
if (FLAG_IS_DEFAULT(CompilationPolicyChoice)) { |
8667
b32929355d27
7020403: Add AdvancedCompilationPolicy for tiered
iveresov
parents:
8499
diff
changeset
|
1457 |
FLAG_SET_DEFAULT(CompilationPolicyChoice, 3); |
6453 | 1458 |
} |
1459 |
if (CompilationPolicyChoice < 2) { |
|
1460 |
vm_exit_during_initialization( |
|
1461 |
"Incompatible compilation policy selected", NULL); |
|
1462 |
} |
|
6988
282ba493439c
6996136: VM crash in src/share/vm/runtime/virtualspace.cpp:424
iveresov
parents:
6987
diff
changeset
|
1463 |
// Increase the code cache size - tiered compiles a lot more. |
6453 | 1464 |
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) { |
29180 | 1465 |
FLAG_SET_ERGO(uintx, ReservedCodeCacheSize, |
1466 |
MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5)); |
|
26796 | 1467 |
} |
1468 |
// Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M |
|
1469 |
if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) { |
|
1470 |
FLAG_SET_ERGO(bool, SegmentedCodeCache, true); |
|
6453 | 1471 |
} |
17383 | 1472 |
if (!UseInterpreter) { // -Xcomp |
1473 |
Tier3InvokeNotifyFreqLog = 0; |
|
1474 |
Tier4InvocationThreshold = 0; |
|
1475 |
} |
|
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1476 |
|
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1477 |
if (CompileThresholdScaling < 0) { |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1478 |
vm_exit_during_initialization("Negative value specified for CompileThresholdScaling", NULL); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1479 |
} |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1480 |
|
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1481 |
// Scale tiered compilation thresholds. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1482 |
// CompileThresholdScaling == 0.0 is equivalent to -Xint and leaves compilation thresholds unchanged. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
1483 |
if (!FLAG_IS_DEFAULT(CompileThresholdScaling) && CompileThresholdScaling > 0.0) { |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1484 |
FLAG_SET_ERGO(intx, Tier0InvokeNotifyFreqLog, scaled_freq_log(Tier0InvokeNotifyFreqLog)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1485 |
FLAG_SET_ERGO(intx, Tier0BackedgeNotifyFreqLog, scaled_freq_log(Tier0BackedgeNotifyFreqLog)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1486 |
|
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1487 |
FLAG_SET_ERGO(intx, Tier3InvocationThreshold, scaled_compile_threshold(Tier3InvocationThreshold)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1488 |
FLAG_SET_ERGO(intx, Tier3MinInvocationThreshold, scaled_compile_threshold(Tier3MinInvocationThreshold)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1489 |
FLAG_SET_ERGO(intx, Tier3CompileThreshold, scaled_compile_threshold(Tier3CompileThreshold)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1490 |
FLAG_SET_ERGO(intx, Tier3BackEdgeThreshold, scaled_compile_threshold(Tier3BackEdgeThreshold)); |
27148
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1491 |
|
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1492 |
// Tier2{Invocation,MinInvocation,Compile,Backedge}Threshold should be scaled here |
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1493 |
// once these thresholds become supported. |
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1494 |
|
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1495 |
FLAG_SET_ERGO(intx, Tier2InvokeNotifyFreqLog, scaled_freq_log(Tier2InvokeNotifyFreqLog)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1496 |
FLAG_SET_ERGO(intx, Tier2BackedgeNotifyFreqLog, scaled_freq_log(Tier2BackedgeNotifyFreqLog)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1497 |
|
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1498 |
FLAG_SET_ERGO(intx, Tier3InvokeNotifyFreqLog, scaled_freq_log(Tier3InvokeNotifyFreqLog)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1499 |
FLAG_SET_ERGO(intx, Tier3BackedgeNotifyFreqLog, scaled_freq_log(Tier3BackedgeNotifyFreqLog)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1500 |
|
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1501 |
FLAG_SET_ERGO(intx, Tier23InlineeNotifyFreqLog, scaled_freq_log(Tier23InlineeNotifyFreqLog)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1502 |
|
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1503 |
FLAG_SET_ERGO(intx, Tier4InvocationThreshold, scaled_compile_threshold(Tier4InvocationThreshold)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1504 |
FLAG_SET_ERGO(intx, Tier4MinInvocationThreshold, scaled_compile_threshold(Tier4MinInvocationThreshold)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1505 |
FLAG_SET_ERGO(intx, Tier4CompileThreshold, scaled_compile_threshold(Tier4CompileThreshold)); |
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
1506 |
FLAG_SET_ERGO(intx, Tier4BackEdgeThreshold, scaled_compile_threshold(Tier4BackEdgeThreshold)); |
27148
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
1507 |
} |
6453 | 1508 |
} |
1509 |
||
5694
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1510 |
void set_object_alignment() { |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1511 |
// Object alignment. |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1512 |
assert(is_power_of_2(ObjectAlignmentInBytes), "ObjectAlignmentInBytes must be power of 2"); |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1513 |
MinObjAlignmentInBytes = ObjectAlignmentInBytes; |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1514 |
assert(MinObjAlignmentInBytes >= HeapWordsPerLong * HeapWordSize, "ObjectAlignmentInBytes value is too small"); |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1515 |
MinObjAlignment = MinObjAlignmentInBytes / HeapWordSize; |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1516 |
assert(MinObjAlignmentInBytes == MinObjAlignment * HeapWordSize, "ObjectAlignmentInBytes value is incorrect"); |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1517 |
MinObjAlignmentInBytesMask = MinObjAlignmentInBytes - 1; |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1518 |
|
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1519 |
LogMinObjAlignmentInBytes = exact_log2(ObjectAlignmentInBytes); |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1520 |
LogMinObjAlignment = LogMinObjAlignmentInBytes - LogHeapWordSize; |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1521 |
|
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1522 |
// Oop encoding heap max |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1523 |
OopEncodingHeapMax = (uint64_t(max_juint) + 1) << LogMinObjAlignmentInBytes; |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1524 |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
1525 |
if (SurvivorAlignmentInBytes == 0) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
1526 |
SurvivorAlignmentInBytes = ObjectAlignmentInBytes; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
1527 |
} |
5694
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1528 |
} |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
1529 |
|
24666
a7a8e70f1bf7
8043723: max_heap_for_compressed_oops() declared with size_t, but defined with uintx
tschatzl
parents:
24489
diff
changeset
|
1530 |
size_t Arguments::max_heap_for_compressed_oops() { |
7388 | 1531 |
// Avoid sign flip. |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1532 |
assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size"); |
19986
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1533 |
// We need to fit both the NULL page and the heap into the memory budget, while |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1534 |
// keeping alignment constraints of the heap. To guarantee the latter, as the |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1535 |
// NULL page is located before the heap, we pad the NULL page to the conservative |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1536 |
// maximum alignment that the GC may ever impose upon the heap. |
46622
910fc72c03e8
8178501: Replace usages of align macros with calls to the align inline functions
stefank
parents:
46619
diff
changeset
|
1537 |
size_t displacement_due_to_null_page = align_up((size_t)os::vm_page_size(), |
910fc72c03e8
8178501: Replace usages of align macros with calls to the align inline functions
stefank
parents:
46619
diff
changeset
|
1538 |
_conservative_max_heap_alignment); |
19986
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1539 |
|
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1540 |
LP64_ONLY(return OopEncodingHeapMax - displacement_due_to_null_page); |
4434 | 1541 |
NOT_LP64(ShouldNotReachHere(); return 0); |
382
02c0a63f30d6
6689523: max heap calculation for compressed oops is off by MaxPermSize
coleenp
parents:
360
diff
changeset
|
1542 |
} |
02c0a63f30d6
6689523: max heap calculation for compressed oops is off by MaxPermSize
coleenp
parents:
360
diff
changeset
|
1543 |
|
15957
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1544 |
void Arguments::set_use_compressed_oops() { |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1545 |
#ifndef ZERO |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1546 |
#ifdef _LP64 |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1547 |
// MaxHeapSize is not set up properly at this point, but |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1548 |
// the only value that can override MaxHeapSize if we are |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1549 |
// to use UseCompressedOops is InitialHeapSize. |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1550 |
size_t max_heap_size = MAX2(MaxHeapSize, InitialHeapSize); |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1551 |
|
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1552 |
if (max_heap_size <= max_heap_for_compressed_oops()) { |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1553 |
#if !defined(COMPILER1) || defined(TIERED) |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1554 |
if (FLAG_IS_DEFAULT(UseCompressedOops)) { |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1555 |
FLAG_SET_ERGO(bool, UseCompressedOops, true); |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1556 |
} |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1557 |
#endif |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1558 |
} else { |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1559 |
if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) { |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1560 |
warning("Max heap size too large for Compressed Oops"); |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1561 |
FLAG_SET_DEFAULT(UseCompressedOops, false); |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1562 |
FLAG_SET_DEFAULT(UseCompressedClassPointers, false); |
15957
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1563 |
} |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1564 |
} |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1565 |
#endif // _LP64 |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1566 |
#endif // ZERO |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1567 |
} |
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1568 |
|
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1569 |
|
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1570 |
// NOTE: set_use_compressed_klass_ptrs() must be called after calling |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1571 |
// set_use_compressed_oops(). |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1572 |
void Arguments::set_use_compressed_klass_ptrs() { |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1573 |
#ifndef ZERO |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1574 |
#ifdef _LP64 |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1575 |
// UseCompressedOops must be on for UseCompressedClassPointers to be on. |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1576 |
if (!UseCompressedOops) { |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1577 |
if (UseCompressedClassPointers) { |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1578 |
warning("UseCompressedClassPointers requires UseCompressedOops"); |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1579 |
} |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1580 |
FLAG_SET_DEFAULT(UseCompressedClassPointers, false); |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1581 |
} else { |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1582 |
// Turn on UseCompressedClassPointers too |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1583 |
if (FLAG_IS_DEFAULT(UseCompressedClassPointers)) { |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1584 |
FLAG_SET_ERGO(bool, UseCompressedClassPointers, true); |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1585 |
} |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1586 |
// Check the CompressedClassSpaceSize to make sure we use compressed klass ptrs. |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1587 |
if (UseCompressedClassPointers) { |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1588 |
if (CompressedClassSpaceSize > KlassEncodingMetaspaceMax) { |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1589 |
warning("CompressedClassSpaceSize is too large for UseCompressedClassPointers"); |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
1590 |
FLAG_SET_DEFAULT(UseCompressedClassPointers, false); |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1591 |
} |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1592 |
} |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1593 |
} |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1594 |
#endif // _LP64 |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1595 |
#endif // !ZERO |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1596 |
} |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1597 |
|
19986
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1598 |
void Arguments::set_conservative_max_heap_alignment() { |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1599 |
// The conservative maximum required alignment for the heap is the maximum of |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1600 |
// the alignments imposed by several sources: any requirements from the heap |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1601 |
// itself, the collector policy and the maximum page size we may run the VM |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1602 |
// with. |
47901
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1603 |
size_t heap_alignment = GCArguments::arguments()->conservative_max_heap_alignment(); |
25729
fa3a77f2977b
8048088: Conservative maximum heap alignment should take vm_allocation_granularity into account
tschatzl
parents:
25468
diff
changeset
|
1604 |
_conservative_max_heap_alignment = MAX4(heap_alignment, |
fa3a77f2977b
8048088: Conservative maximum heap alignment should take vm_allocation_granularity into account
tschatzl
parents:
25468
diff
changeset
|
1605 |
(size_t)os::vm_allocation_granularity(), |
fa3a77f2977b
8048088: Conservative maximum heap alignment should take vm_allocation_granularity into account
tschatzl
parents:
25468
diff
changeset
|
1606 |
os::max_page_size(), |
fa3a77f2977b
8048088: Conservative maximum heap alignment should take vm_allocation_granularity into account
tschatzl
parents:
25468
diff
changeset
|
1607 |
CollectorPolicy::compute_heap_alignment()); |
19986
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1608 |
} |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1609 |
|
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1610 |
#ifdef TIERED |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1611 |
bool Arguments::compilation_mode_selected() { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1612 |
return !FLAG_IS_DEFAULT(TieredCompilation) || !FLAG_IS_DEFAULT(TieredStopAtLevel) || |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1613 |
!FLAG_IS_DEFAULT(UseAOT) JVMCI_ONLY(|| !FLAG_IS_DEFAULT(EnableJVMCI) || !FLAG_IS_DEFAULT(UseJVMCICompiler)); |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1614 |
|
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1615 |
} |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1616 |
|
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1617 |
void Arguments::select_compilation_mode_ergonomically() { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1618 |
#if defined(_WINDOWS) && !defined(_LP64) |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1619 |
if (FLAG_IS_DEFAULT(NeverActAsServerClassMachine)) { |
43473
3beee3e324cf
8173037: V [jvm.dll+0x2343fc] GraphBuilder::args_list_for_profiling+0x8c
jcm
parents:
43469
diff
changeset
|
1620 |
FLAG_SET_ERGO(bool, NeverActAsServerClassMachine, true); |
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1621 |
} |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1622 |
#endif |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1623 |
if (NeverActAsServerClassMachine) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1624 |
set_client_compilation_mode(); |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1625 |
} |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1626 |
} |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1627 |
#endif //TIERED |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1628 |
|
43433
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1629 |
#if INCLUDE_JVMCI |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1630 |
void Arguments::set_jvmci_specific_flags() { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1631 |
if (UseJVMCICompiler) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1632 |
if (FLAG_IS_DEFAULT(TypeProfileWidth)) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1633 |
FLAG_SET_DEFAULT(TypeProfileWidth, 8); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1634 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1635 |
if (FLAG_IS_DEFAULT(OnStackReplacePercentage)) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1636 |
FLAG_SET_DEFAULT(OnStackReplacePercentage, 933); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1637 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1638 |
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1639 |
FLAG_SET_DEFAULT(ReservedCodeCacheSize, 64*M); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1640 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1641 |
if (FLAG_IS_DEFAULT(InitialCodeCacheSize)) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1642 |
FLAG_SET_DEFAULT(InitialCodeCacheSize, 16*M); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1643 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1644 |
if (FLAG_IS_DEFAULT(MetaspaceSize)) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1645 |
FLAG_SET_DEFAULT(MetaspaceSize, 12*M); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1646 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1647 |
if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1648 |
FLAG_SET_DEFAULT(NewSizeThreadIncrease, 4*K); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1649 |
} |
43937
def72508767d
8173119: compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
thartmann
parents:
43473
diff
changeset
|
1650 |
if (TieredStopAtLevel != CompLevel_full_optimization) { |
def72508767d
8173119: compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
thartmann
parents:
43473
diff
changeset
|
1651 |
// Currently JVMCI compiler can only work at the full optimization level |
def72508767d
8173119: compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
thartmann
parents:
43473
diff
changeset
|
1652 |
warning("forcing TieredStopAtLevel to full optimization because JVMCI is enabled"); |
def72508767d
8173119: compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
thartmann
parents:
43473
diff
changeset
|
1653 |
TieredStopAtLevel = CompLevel_full_optimization; |
def72508767d
8173119: compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
thartmann
parents:
43473
diff
changeset
|
1654 |
} |
43433
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1655 |
if (FLAG_IS_DEFAULT(TypeProfileLevel)) { |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1656 |
FLAG_SET_DEFAULT(TypeProfileLevel, 0); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1657 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1658 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1659 |
} |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1660 |
#endif |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
1661 |
|
47901
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1662 |
jint Arguments::set_ergonomics_flags() { |
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1663 |
#ifdef TIERED |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1664 |
if (!compilation_mode_selected()) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1665 |
select_compilation_mode_ergonomically(); |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1666 |
} |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1667 |
#endif |
47901
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1668 |
|
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1669 |
jint gc_result = GCArguments::initialize(); |
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1670 |
if (gc_result != JNI_OK) { |
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1671 |
return gc_result; |
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1672 |
} |
26836
b27ec66071c7
8057531: refactor gc argument processing code slightly
jcoomes
parents:
26824
diff
changeset
|
1673 |
|
47799 | 1674 |
#if COMPILER2_OR_JVMCI |
20058
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1675 |
// Shared spaces work fine with other GCs but causes bytecode rewriting |
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1676 |
// to be disabled, which hurts interpreter performance and decreases |
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1677 |
// server performance. When -server is specified, keep the default off |
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1678 |
// unless it is asked for. Future work: either add bytecode rewriting |
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1679 |
// at link time, or rewrite bytecodes in non-shared methods. |
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
1680 |
if (is_server_compilation_mode_vm() && !DumpSharedSpaces && !RequireSharedSpaces && |
20058
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1681 |
(FLAG_IS_DEFAULT(UseSharedSpaces) || !UseSharedSpaces)) { |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
1682 |
no_shared_spaces("COMPILER2 default: -Xshare:auto | off, have to manually setup to on."); |
20058
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1683 |
} |
fc8fd1c76fe2
8024517: runtime/CDSCompressedKPtrs/XShareAuto.java failed with RuntimeException
hseigel
parents:
20054
diff
changeset
|
1684 |
#endif |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
249
diff
changeset
|
1685 |
|
19986
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1686 |
set_conservative_max_heap_alignment(); |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
1687 |
|
4013 | 1688 |
#ifndef ZERO |
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
249
diff
changeset
|
1689 |
#ifdef _LP64 |
15957
58302a2ffb9a
8001049: VM crashes when running with large -Xms and not specifying ObjectAlignmentInBytes
brutisso
parents:
15950
diff
changeset
|
1690 |
set_use_compressed_oops(); |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1691 |
|
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1692 |
// set_use_compressed_klass_ptrs() must be called after calling |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1693 |
// set_use_compressed_oops(). |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1694 |
set_use_compressed_klass_ptrs(); |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
1695 |
|
360
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
249
diff
changeset
|
1696 |
// Also checks that certain machines are slower with compressed oops |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
249
diff
changeset
|
1697 |
// in vm_version initialization code. |
21d113ecbf6a
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
249
diff
changeset
|
1698 |
#endif // _LP64 |
4013 | 1699 |
#endif // !ZERO |
31608 | 1700 |
|
47901
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1701 |
return JNI_OK; |
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1702 |
} |
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1703 |
|
26836
b27ec66071c7
8057531: refactor gc argument processing code slightly
jcoomes
parents:
26824
diff
changeset
|
1704 |
void Arguments::set_gc_specific_flags() { |
47901
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1705 |
// Set GC flags |
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
1706 |
GCArguments::arguments()->initialize_flags(); |
26836
b27ec66071c7
8057531: refactor gc argument processing code slightly
jcoomes
parents:
26824
diff
changeset
|
1707 |
} |
b27ec66071c7
8057531: refactor gc argument processing code slightly
jcoomes
parents:
26824
diff
changeset
|
1708 |
|
16605
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1709 |
julong Arguments::limit_by_allocatable_memory(julong limit) { |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1710 |
julong max_allocatable; |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1711 |
julong result = limit; |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1712 |
if (os::has_allocatable_memory_limit(&max_allocatable)) { |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1713 |
result = MIN2(result, max_allocatable / MaxVirtMemFraction); |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1714 |
} |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1715 |
return result; |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1716 |
} |
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1717 |
|
22890
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1718 |
// Use static initialization to get the default before parsing |
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
1719 |
static const size_t DefaultHeapBaseMinAddress = HeapBaseMinAddress; |
22890
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1720 |
|
4434 | 1721 |
void Arguments::set_heap_size() { |
42654
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1722 |
julong phys_mem = |
4434 | 1723 |
FLAG_IS_DEFAULT(MaxRAM) ? MIN2(os::physical_memory(), (julong)MaxRAM) |
1724 |
: (julong)MaxRAM; |
|
1725 |
||
42654
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1726 |
// Experimental support for CGroup memory limits |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1727 |
if (UseCGroupMemoryLimitForHeap) { |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1728 |
// This is a rough indicator that a CGroup limit may be in force |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1729 |
// for this process |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1730 |
const char* lim_file = "/sys/fs/cgroup/memory/memory.limit_in_bytes"; |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1731 |
FILE *fp = fopen(lim_file, "r"); |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1732 |
if (fp != NULL) { |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1733 |
julong cgroup_max = 0; |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1734 |
int ret = fscanf(fp, JULONG_FORMAT, &cgroup_max); |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1735 |
if (ret == 1 && cgroup_max > 0) { |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1736 |
// If unlimited, cgroup_max will be a very large, but unspecified |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1737 |
// value, so use initial phys_mem as a limit |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1738 |
log_info(gc, heap)("Setting phys_mem to the min of cgroup limit (" |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1739 |
JULONG_FORMAT "MB) and initial phys_mem (" |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1740 |
JULONG_FORMAT "MB)", cgroup_max/M, phys_mem/M); |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1741 |
phys_mem = MIN2(cgroup_max, phys_mem); |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1742 |
} else { |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1743 |
warning("Unable to read/parse cgroup memory limit from %s: %s", |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1744 |
lim_file, errno != 0 ? strerror(errno) : "unknown error"); |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1745 |
} |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1746 |
fclose(fp); |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1747 |
} else { |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1748 |
warning("Unable to open cgroup memory limit file %s (%s)", lim_file, strerror(errno)); |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1749 |
} |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1750 |
} |
6bf23e6fb9ca
8170888: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
dholmes
parents:
42647
diff
changeset
|
1751 |
|
47100
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1752 |
// Convert deprecated flags |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1753 |
if (FLAG_IS_DEFAULT(MaxRAMPercentage) && |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1754 |
!FLAG_IS_DEFAULT(MaxRAMFraction)) |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1755 |
MaxRAMPercentage = 100.0 / MaxRAMFraction; |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1756 |
|
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1757 |
if (FLAG_IS_DEFAULT(MinRAMPercentage) && |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1758 |
!FLAG_IS_DEFAULT(MinRAMFraction)) |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1759 |
MinRAMPercentage = 100.0 / MinRAMFraction; |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1760 |
|
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1761 |
if (FLAG_IS_DEFAULT(InitialRAMPercentage) && |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1762 |
!FLAG_IS_DEFAULT(InitialRAMFraction)) |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1763 |
InitialRAMPercentage = 100.0 / InitialRAMFraction; |
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1764 |
|
4434 | 1765 |
// If the maximum heap size has not been set with -Xmx, |
1766 |
// then set it as fraction of the size of physical memory, |
|
1767 |
// respecting the maximum and minimum sizes of the heap. |
|
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1768 |
if (FLAG_IS_DEFAULT(MaxHeapSize)) { |
47100
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1769 |
julong reasonable_max = (julong)((phys_mem * MaxRAMPercentage) / 100); |
47801
c7b50c23ea71
8190283: Default heap sizing options select a MaxHeapSize larger than available physical memory in some cases
bobv
parents:
47799
diff
changeset
|
1770 |
const julong reasonable_min = (julong)((phys_mem * MinRAMPercentage) / 100); |
c7b50c23ea71
8190283: Default heap sizing options select a MaxHeapSize larger than available physical memory in some cases
bobv
parents:
47799
diff
changeset
|
1771 |
if (reasonable_min < MaxHeapSize) { |
4434 | 1772 |
// Small physical memory, so use a minimum fraction of it for the heap |
47801
c7b50c23ea71
8190283: Default heap sizing options select a MaxHeapSize larger than available physical memory in some cases
bobv
parents:
47799
diff
changeset
|
1773 |
reasonable_max = reasonable_min; |
4434 | 1774 |
} else { |
1775 |
// Not-small physical memory, so require a heap at least |
|
1776 |
// as large as MaxHeapSize |
|
1777 |
reasonable_max = MAX2(reasonable_max, (julong)MaxHeapSize); |
|
1778 |
} |
|
47100
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1779 |
|
4434 | 1780 |
if (!FLAG_IS_DEFAULT(ErgoHeapSizeLimit) && ErgoHeapSizeLimit != 0) { |
1781 |
// Limit the heap size to ErgoHeapSizeLimit |
|
1782 |
reasonable_max = MIN2(reasonable_max, (julong)ErgoHeapSizeLimit); |
|
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1783 |
} |
4434 | 1784 |
if (UseCompressedOops) { |
1785 |
// Limit the heap size to the maximum possible when using compressed oops |
|
7388 | 1786 |
julong max_coop_heap = (julong)max_heap_for_compressed_oops(); |
22890
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1787 |
|
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1788 |
// HeapBaseMinAddress can be greater than default but not less than. |
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1789 |
if (!FLAG_IS_DEFAULT(HeapBaseMinAddress)) { |
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1790 |
if (HeapBaseMinAddress < DefaultHeapBaseMinAddress) { |
23184
060625af5ce9
8036547: test/runtime/CompressedOops/CompressedClassPointers.java fails with product build since -XX:+PrintMiscellaneous is a debug only flag
coleenp
parents:
22929
diff
changeset
|
1791 |
// matches compressed oops printing flags |
37428
6e724f3d488b
8152896: Convert PrintCompressedOopsMode to Unified Logging
rprotacio
parents:
37261
diff
changeset
|
1792 |
log_debug(gc, heap, coops)("HeapBaseMinAddress must be at least " SIZE_FORMAT |
6e724f3d488b
8152896: Convert PrintCompressedOopsMode to Unified Logging
rprotacio
parents:
37261
diff
changeset
|
1793 |
" (" SIZE_FORMAT "G) which is greater than value given " SIZE_FORMAT, |
6e724f3d488b
8152896: Convert PrintCompressedOopsMode to Unified Logging
rprotacio
parents:
37261
diff
changeset
|
1794 |
DefaultHeapBaseMinAddress, |
6e724f3d488b
8152896: Convert PrintCompressedOopsMode to Unified Logging
rprotacio
parents:
37261
diff
changeset
|
1795 |
DefaultHeapBaseMinAddress/G, |
6e724f3d488b
8152896: Convert PrintCompressedOopsMode to Unified Logging
rprotacio
parents:
37261
diff
changeset
|
1796 |
HeapBaseMinAddress); |
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
1797 |
FLAG_SET_ERGO(size_t, HeapBaseMinAddress, DefaultHeapBaseMinAddress); |
22890
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1798 |
} |
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1799 |
} |
7ca31eb1a41f
7014526: "java -version" crash on sparc with some values of HeapBaseMinAddress
coleenp
parents:
22771
diff
changeset
|
1800 |
|
7388 | 1801 |
if (HeapBaseMinAddress + MaxHeapSize < max_coop_heap) { |
1802 |
// Heap should be above HeapBaseMinAddress to get zero based compressed oops |
|
1803 |
// but it should be not less than default MaxHeapSize. |
|
1804 |
max_coop_heap -= HeapBaseMinAddress; |
|
1805 |
} |
|
1806 |
reasonable_max = MIN2(reasonable_max, max_coop_heap); |
|
4434 | 1807 |
} |
16605
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1808 |
reasonable_max = limit_by_allocatable_memory(reasonable_max); |
4434 | 1809 |
|
1810 |
if (!FLAG_IS_DEFAULT(InitialHeapSize)) { |
|
1811 |
// An initial heap size was specified on the command line, |
|
1812 |
// so be sure that the maximum size is consistent. Done |
|
16605
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1813 |
// after call to limit_by_allocatable_memory because that |
4434 | 1814 |
// method might reduce the allocation size. |
1815 |
reasonable_max = MAX2(reasonable_max, (julong)InitialHeapSize); |
|
1816 |
} |
|
1817 |
||
35061 | 1818 |
log_trace(gc, heap)(" Maximum heap size " SIZE_FORMAT, (size_t) reasonable_max); |
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
1819 |
FLAG_SET_ERGO(size_t, MaxHeapSize, (size_t)reasonable_max); |
4434 | 1820 |
} |
1821 |
||
17322
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1822 |
// If the minimum or initial heap_size have not been set or requested to be set |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1823 |
// ergonomically, set them accordingly. |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1824 |
if (InitialHeapSize == 0 || min_heap_size() == 0) { |
4444
877bb3341a10
6900899: vm fails to start when -Xmx value is less than OldSize + NewSize
phh
parents:
4439
diff
changeset
|
1825 |
julong reasonable_minimum = (julong)(OldSize + NewSize); |
877bb3341a10
6900899: vm fails to start when -Xmx value is less than OldSize + NewSize
phh
parents:
4439
diff
changeset
|
1826 |
|
877bb3341a10
6900899: vm fails to start when -Xmx value is less than OldSize + NewSize
phh
parents:
4439
diff
changeset
|
1827 |
reasonable_minimum = MIN2(reasonable_minimum, (julong)MaxHeapSize); |
877bb3341a10
6900899: vm fails to start when -Xmx value is less than OldSize + NewSize
phh
parents:
4439
diff
changeset
|
1828 |
|
16605
ba13efd453bc
7112912: Message "Error occurred during initialization of VM" on boxes with lots of RAM
tschatzl
parents:
16450
diff
changeset
|
1829 |
reasonable_minimum = limit_by_allocatable_memory(reasonable_minimum); |
4444
877bb3341a10
6900899: vm fails to start when -Xmx value is less than OldSize + NewSize
phh
parents:
4439
diff
changeset
|
1830 |
|
17322
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1831 |
if (InitialHeapSize == 0) { |
47100
17953cf82d51
8186248: Allow more flexibility in selecting Heap % of available RAM
bobv
parents:
46815
diff
changeset
|
1832 |
julong reasonable_initial = (julong)((phys_mem * InitialRAMPercentage) / 100); |
17322
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1833 |
|
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1834 |
reasonable_initial = MAX3(reasonable_initial, reasonable_minimum, (julong)min_heap_size()); |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1835 |
reasonable_initial = MIN2(reasonable_initial, (julong)MaxHeapSize); |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1836 |
|
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1837 |
reasonable_initial = limit_by_allocatable_memory(reasonable_initial); |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1838 |
|
35061 | 1839 |
log_trace(gc, heap)(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial); |
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
1840 |
FLAG_SET_ERGO(size_t, InitialHeapSize, (size_t)reasonable_initial); |
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1841 |
} |
17322
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1842 |
// If the minimum heap size has not been set (via -Xms), |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1843 |
// synchronize with InitialHeapSize to avoid errors with the default value. |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1844 |
if (min_heap_size() == 0) { |
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
1845 |
set_min_heap_size(MIN2((size_t)reasonable_minimum, InitialHeapSize)); |
35061 | 1846 |
log_trace(gc, heap)(" Minimum heap size " SIZE_FORMAT, min_heap_size()); |
17322
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
1847 |
} |
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1848 |
} |
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1849 |
} |
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
1850 |
|
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1851 |
// This option inspects the machine and attempts to set various |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1852 |
// parameters to be optimal for long-running, memory allocation |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1853 |
// intensive jobs. It is intended for machines with large |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1854 |
// amounts of cpu and memory. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1855 |
jint Arguments::set_aggressive_heap_flags() { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1856 |
// initHeapSize is needed since _initial_heap_size is 4 bytes on a 32 bit |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1857 |
// VM, but we may not be able to represent the total physical memory |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1858 |
// available (like having 8gb of memory on a box but using a 32bit VM). |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1859 |
// Thus, we need to make sure we're using a julong for intermediate |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1860 |
// calculations. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1861 |
julong initHeapSize; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1862 |
julong total_memory = os::physical_memory(); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1863 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1864 |
if (total_memory < (julong) 256 * M) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1865 |
jio_fprintf(defaultStream::error_stream(), |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1866 |
"You need at least 256mb of memory to use -XX:+AggressiveHeap\n"); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1867 |
vm_exit(1); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1868 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1869 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1870 |
// The heap size is half of available memory, or (at most) |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1871 |
// all of possible memory less 160mb (leaving room for the OS |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1872 |
// when using ISM). This is the maximum; because adaptive sizing |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1873 |
// is turned on below, the actual space used may be smaller. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1874 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1875 |
initHeapSize = MIN2(total_memory / (julong) 2, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1876 |
total_memory - (julong) 160 * M); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1877 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1878 |
initHeapSize = limit_by_allocatable_memory(initHeapSize); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1879 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1880 |
if (FLAG_IS_DEFAULT(MaxHeapSize)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1881 |
if (FLAG_SET_CMDLINE(size_t, MaxHeapSize, initHeapSize) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1882 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1883 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1884 |
if (FLAG_SET_CMDLINE(size_t, InitialHeapSize, initHeapSize) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1885 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1886 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1887 |
// Currently the minimum size and the initial heap sizes are the same. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1888 |
set_min_heap_size(initHeapSize); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1889 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1890 |
if (FLAG_IS_DEFAULT(NewSize)) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1891 |
// Make the young generation 3/8ths of the total heap. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1892 |
if (FLAG_SET_CMDLINE(size_t, NewSize, |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1893 |
((julong) MaxHeapSize / (julong) 8) * (julong) 3) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1894 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1895 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1896 |
if (FLAG_SET_CMDLINE(size_t, MaxNewSize, NewSize) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1897 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1898 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1899 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1900 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1901 |
#if !defined(_ALLBSD_SOURCE) && !defined(AIX) // UseLargePages is not yet supported on BSD and AIX. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1902 |
FLAG_SET_DEFAULT(UseLargePages, true); |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1903 |
#endif |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1904 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1905 |
// Increase some data structure sizes for efficiency |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1906 |
if (FLAG_SET_CMDLINE(size_t, BaseFootPrintEstimate, MaxHeapSize) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1907 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1908 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1909 |
if (FLAG_SET_CMDLINE(bool, ResizeTLAB, false) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1910 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1911 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1912 |
if (FLAG_SET_CMDLINE(size_t, TLABSize, 256 * K) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1913 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1914 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1915 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1916 |
// See the OldPLABSize comment below, but replace 'after promotion' |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1917 |
// with 'after copying'. YoungPLABSize is the size of the survivor |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1918 |
// space per-gc-thread buffers. The default is 4kw. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1919 |
if (FLAG_SET_CMDLINE(size_t, YoungPLABSize, 256 * K) != Flag::SUCCESS) { // Note: this is in words |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1920 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1921 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1922 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1923 |
// OldPLABSize is the size of the buffers in the old gen that |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1924 |
// UseParallelGC uses to promote live data that doesn't fit in the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1925 |
// survivor spaces. At any given time, there's one for each gc thread. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1926 |
// The default size is 1kw. These buffers are rarely used, since the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1927 |
// survivor spaces are usually big enough. For specjbb, however, there |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1928 |
// are occasions when there's lots of live data in the young gen |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1929 |
// and we end up promoting some of it. We don't have a definite |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1930 |
// explanation for why bumping OldPLABSize helps, but the theory |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1931 |
// is that a bigger PLAB results in retaining something like the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1932 |
// original allocation order after promotion, which improves mutator |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1933 |
// locality. A minor effect may be that larger PLABs reduce the |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1934 |
// number of PLAB allocation events during gc. The value of 8kw |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1935 |
// was arrived at by experimenting with specjbb. |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1936 |
if (FLAG_SET_CMDLINE(size_t, OldPLABSize, 8 * K) != Flag::SUCCESS) { // Note: this is in words |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1937 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1938 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1939 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1940 |
// Enable parallel GC and adaptive generation sizing |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1941 |
if (FLAG_SET_CMDLINE(bool, UseParallelGC, true) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1942 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1943 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1944 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1945 |
// Encourage steady state memory management |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1946 |
if (FLAG_SET_CMDLINE(uintx, ThresholdTolerance, 100) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1947 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1948 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1949 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1950 |
// This appears to improve mutator locality |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1951 |
if (FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1952 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1953 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1954 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1955 |
// Get around early Solaris scheduling bug |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1956 |
// (affinity vs other jobs on system) |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1957 |
// but disallow DR and offlining (5008695). |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1958 |
if (FLAG_SET_CMDLINE(bool, BindGCTaskThreadsToCPUs, true) != Flag::SUCCESS) { |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1959 |
return JNI_EINVAL; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1960 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1961 |
|
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1962 |
return JNI_OK; |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1963 |
} |
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
1964 |
|
30117
cce2cdac56dc
8074345: Enable RewriteBytecodes when VM runs with CDS
minqi
parents:
30101
diff
changeset
|
1965 |
// This must be called after ergonomics. |
1 | 1966 |
void Arguments::set_bytecode_flags() { |
1967 |
if (!RewriteBytecodes) { |
|
1968 |
FLAG_SET_DEFAULT(RewriteFrequentPairs, false); |
|
1969 |
} |
|
1970 |
} |
|
1971 |
||
1972 |
// Aggressive optimization flags -XX:+AggressiveOpts |
|
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
1973 |
jint Arguments::set_aggressive_opts_flags() { |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1974 |
#ifdef COMPILER2 |
17383 | 1975 |
if (AggressiveUnboxing) { |
1976 |
if (FLAG_IS_DEFAULT(EliminateAutoBox)) { |
|
1977 |
FLAG_SET_DEFAULT(EliminateAutoBox, true); |
|
1978 |
} else if (!EliminateAutoBox) { |
|
1979 |
// warning("AggressiveUnboxing is disabled because EliminateAutoBox is disabled"); |
|
1980 |
AggressiveUnboxing = false; |
|
1981 |
} |
|
1982 |
if (FLAG_IS_DEFAULT(DoEscapeAnalysis)) { |
|
1983 |
FLAG_SET_DEFAULT(DoEscapeAnalysis, true); |
|
1984 |
} else if (!DoEscapeAnalysis) { |
|
1985 |
// warning("AggressiveUnboxing is disabled because DoEscapeAnalysis is disabled"); |
|
1986 |
AggressiveUnboxing = false; |
|
1987 |
} |
|
1988 |
} |
|
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1989 |
if (AggressiveOpts || !FLAG_IS_DEFAULT(AutoBoxCacheMax)) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1990 |
if (FLAG_IS_DEFAULT(EliminateAutoBox)) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1991 |
FLAG_SET_DEFAULT(EliminateAutoBox, true); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1992 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1993 |
if (FLAG_IS_DEFAULT(AutoBoxCacheMax)) { |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1994 |
FLAG_SET_DEFAULT(AutoBoxCacheMax, 20000); |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1995 |
} |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1996 |
|
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1997 |
// Feed the cache size setting into the JDK |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
1998 |
char buffer[1024]; |
41540 | 1999 |
jio_snprintf(buffer, 1024, "java.lang.Integer.IntegerCache.high=" INTX_FORMAT, AutoBoxCacheMax); |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
2000 |
if (!add_property(buffer)) { |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
2001 |
return JNI_ENOMEM; |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
2002 |
} |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
2003 |
} |
1496
3fd9157e5e3c
6649622: HotSpot Biased locking needs tuning on latest CPUs
never
parents:
1395
diff
changeset
|
2004 |
if (AggressiveOpts && FLAG_IS_DEFAULT(BiasedLockingStartupDelay)) { |
3fd9157e5e3c
6649622: HotSpot Biased locking needs tuning on latest CPUs
never
parents:
1395
diff
changeset
|
2005 |
FLAG_SET_DEFAULT(BiasedLockingStartupDelay, 500); |
3fd9157e5e3c
6649622: HotSpot Biased locking needs tuning on latest CPUs
never
parents:
1395
diff
changeset
|
2006 |
} |
190
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
2007 |
#endif |
e9a0a9dcd4f6
6395208: Elide autoboxing for calls to HashMap.get(int) and HashMap.get(long)
never
parents:
1
diff
changeset
|
2008 |
|
1 | 2009 |
if (AggressiveOpts) { |
234 | 2010 |
// Sample flag setting code |
2011 |
// if (FLAG_IS_DEFAULT(EliminateZeroing)) { |
|
2012 |
// FLAG_SET_DEFAULT(EliminateZeroing, true); |
|
2013 |
// } |
|
1 | 2014 |
} |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
2015 |
|
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
2016 |
return JNI_OK; |
1 | 2017 |
} |
2018 |
||
2019 |
//=========================================================================================================== |
|
2020 |
// Parsing of java.compiler property |
|
2021 |
||
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
2022 |
void Arguments::process_java_compiler_argument(const char* arg) { |
1 | 2023 |
// For backwards compatibility, Djava.compiler=NONE or "" |
2024 |
// causes us to switch to -Xint mode UNLESS -Xdebug |
|
2025 |
// is also specified. |
|
2026 |
if (strlen(arg) == 0 || strcasecmp(arg, "NONE") == 0) { |
|
2027 |
set_java_compiler(true); // "-Djava.compiler[=...]" most recently seen. |
|
2028 |
} |
|
2029 |
} |
|
2030 |
||
2031 |
void Arguments::process_java_launcher_argument(const char* launcher, void* extra_info) { |
|
25949 | 2032 |
_sun_java_launcher = os::strdup_check_oom(launcher); |
1 | 2033 |
} |
2034 |
||
2035 |
bool Arguments::created_by_java_launcher() { |
|
2036 |
assert(_sun_java_launcher != NULL, "property must have value"); |
|
2037 |
return strcmp(DEFAULT_JAVA_LAUNCHER, _sun_java_launcher) != 0; |
|
2038 |
} |
|
2039 |
||
22734
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
2040 |
bool Arguments::sun_java_launcher_is_altjvm() { |
41757c1f3946
8027113: decouple the '-XXaltjvm=<path>' option from the gamma launcher
rdurbin
parents:
22524
diff
changeset
|
2041 |
return _sun_java_launcher_is_altjvm; |
8476
7e34c2d4cf9b
7022037: Pause when exiting if debugger is attached on windows
sla
parents:
8313
diff
changeset
|
2042 |
} |
7e34c2d4cf9b
7022037: Pause when exiting if debugger is attached on windows
sla
parents:
8313
diff
changeset
|
2043 |
|
1 | 2044 |
//=========================================================================================================== |
2045 |
// Parsing of main arguments |
|
2046 |
||
36313
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2047 |
#if INCLUDE_JVMCI |
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2048 |
// Check consistency of jvmci vm argument settings. |
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2049 |
bool Arguments::check_jvmci_args_consistency() { |
40081
50be9fe0e9c2
8161265: [JVMCI] EnableJVMCI should only be required when its not implied by other flags
dnsimon
parents:
39621
diff
changeset
|
2050 |
return JVMCIGlobals::check_jvmci_flags_are_consistent(); |
36313
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2051 |
} |
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2052 |
#endif //INCLUDE_JVMCI |
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2053 |
|
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2054 |
// Check consistency of GC selection |
29696
01571dfab5be
8073944: Simplify ArgumentsExt and remove unneeded functionallity
sjohanss
parents:
29459
diff
changeset
|
2055 |
bool Arguments::check_gc_consistency() { |
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2056 |
// Ensure that the user has not selected conflicting sets |
27898
813ad96387b3
8065972: Remove support for ParNew+SerialOld and DefNew+CMS
brutisso
parents:
27892
diff
changeset
|
2057 |
// of collectors. |
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2058 |
uint i = 0; |
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2059 |
if (UseSerialGC) i++; |
27898
813ad96387b3
8065972: Remove support for ParNew+SerialOld and DefNew+CMS
brutisso
parents:
27892
diff
changeset
|
2060 |
if (UseConcMarkSweepGC) i++; |
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2061 |
if (UseParallelGC || UseParallelOldGC) i++; |
3262
30d1c247fc25
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
2741
diff
changeset
|
2062 |
if (UseG1GC) i++; |
55767
8e22715afabc
Initial import of Epsilon sources from jdk10/sandbox
shade
parents:
47572
diff
changeset
|
2063 |
if (UseEpsilonGC) i++; |
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2064 |
if (i > 1) { |
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2065 |
jio_fprintf(defaultStream::error_stream(), |
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2066 |
"Conflicting collector combinations in option list; " |
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2067 |
"please refer to the release notes for the combinations " |
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2068 |
"allowed\n"); |
27898
813ad96387b3
8065972: Remove support for ParNew+SerialOld and DefNew+CMS
brutisso
parents:
27892
diff
changeset
|
2069 |
return false; |
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
2070 |
} |
27898
813ad96387b3
8065972: Remove support for ParNew+SerialOld and DefNew+CMS
brutisso
parents:
27892
diff
changeset
|
2071 |
|
813ad96387b3
8065972: Remove support for ParNew+SerialOld and DefNew+CMS
brutisso
parents:
27892
diff
changeset
|
2072 |
return true; |
15092
9228d92ed521
8003820: Deprecate untested and rarely used GC combinations
brutisso
parents:
15091
diff
changeset
|
2073 |
} |
9228d92ed521
8003820: Deprecate untested and rarely used GC combinations
brutisso
parents:
15091
diff
changeset
|
2074 |
|
1 | 2075 |
// Check the consistency of vm_init_args |
2076 |
bool Arguments::check_vm_args_consistency() { |
|
2077 |
// Method for adding checks for flag consistency. |
|
2078 |
// The intent is to warn the user of all possible conflicts, |
|
2079 |
// before returning an error. |
|
2080 |
// Note: Needs platform-dependent factoring. |
|
2081 |
bool status = true; |
|
2082 |
||
2083 |
if (TLABRefillWasteFraction == 0) { |
|
2084 |
jio_fprintf(defaultStream::error_stream(), |
|
2085 |
"TLABRefillWasteFraction should be a denominator, " |
|
2086 |
"not " SIZE_FORMAT "\n", |
|
2087 |
TLABRefillWasteFraction); |
|
2088 |
status = false; |
|
2089 |
} |
|
2090 |
||
2091 |
if (FullGCALot && FLAG_IS_DEFAULT(MarkSweepAlwaysCompactCount)) { |
|
2092 |
MarkSweepAlwaysCompactCount = 1; // Move objects every gc. |
|
2093 |
} |
|
2094 |
||
24941
4ebbe176a7b1
8042298: Remove the names gen0 and gen1 from the GC code
jwilhelm
parents:
24666
diff
changeset
|
2095 |
if (!(UseParallelGC || UseParallelOldGC) && FLAG_IS_DEFAULT(ScavengeBeforeFullGC)) { |
4ebbe176a7b1
8042298: Remove the names gen0 and gen1 from the GC code
jwilhelm
parents:
24666
diff
changeset
|
2096 |
FLAG_SET_DEFAULT(ScavengeBeforeFullGC, false); |
4ebbe176a7b1
8042298: Remove the names gen0 and gen1 from the GC code
jwilhelm
parents:
24666
diff
changeset
|
2097 |
} |
4ebbe176a7b1
8042298: Remove the names gen0 and gen1 from the GC code
jwilhelm
parents:
24666
diff
changeset
|
2098 |
|
1 | 2099 |
if (GCTimeLimit == 100) { |
2100 |
// Turn off gc-overhead-limit-exceeded checks |
|
2101 |
FLAG_SET_DEFAULT(UseGCOverheadLimit, false); |
|
2102 |
} |
|
2103 |
||
29696
01571dfab5be
8073944: Simplify ArgumentsExt and remove unneeded functionallity
sjohanss
parents:
29459
diff
changeset
|
2104 |
status = status && check_gc_consistency(); |
1 | 2105 |
|
2106 |
// CMS space iteration, which FLSVerifyAllHeapreferences entails, |
|
2107 |
// insists that we hold the requisite locks so that the iteration is |
|
2108 |
// MT-safe. For the verification at start-up and shut-down, we don't |
|
2109 |
// yet have a good way of acquiring and releasing these locks, |
|
2110 |
// which are not visible at the CollectedHeap level. We want to |
|
2111 |
// be able to acquire these locks and then do the iteration rather |
|
2112 |
// than just disable the lock verification. This will be fixed under |
|
2113 |
// bug 4788986. |
|
2114 |
if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) { |
|
16680
960505df90e7
8011343: Add new flag for verifying the heap during startup
johnc
parents:
16610
diff
changeset
|
2115 |
if (VerifyDuringStartup) { |
1 | 2116 |
warning("Heap verification at start-up disabled " |
2117 |
"(due to current incompatibility with FLSVerifyAllHeapReferences)"); |
|
16680
960505df90e7
8011343: Add new flag for verifying the heap during startup
johnc
parents:
16610
diff
changeset
|
2118 |
VerifyDuringStartup = false; // Disable verification at start-up |
1 | 2119 |
} |
16680
960505df90e7
8011343: Add new flag for verifying the heap during startup
johnc
parents:
16610
diff
changeset
|
2120 |
|
1 | 2121 |
if (VerifyBeforeExit) { |
2122 |
warning("Heap verification at shutdown disabled " |
|
2123 |
"(due to current incompatibility with FLSVerifyAllHeapReferences)"); |
|
2124 |
VerifyBeforeExit = false; // Disable verification at shutdown |
|
2125 |
} |
|
2126 |
} |
|
2127 |
||
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2128 |
if (PrintNMTStatistics) { |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2129 |
#if INCLUDE_NMT |
25946 | 2130 |
if (MemTracker::tracking_level() == NMT_off) { |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2131 |
#endif // INCLUDE_NMT |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2132 |
warning("PrintNMTStatistics is disabled, because native memory tracking is not enabled"); |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2133 |
PrintNMTStatistics = false; |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2134 |
#if INCLUDE_NMT |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2135 |
} |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2136 |
#endif |
13861
619cff4bfb8b
7188594: Print statistic collected by NMT with VM flag
zgu
parents:
13739
diff
changeset
|
2137 |
} |
43937
def72508767d
8173119: compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally
thartmann
parents:
43473
diff
changeset
|
2138 |
|
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2139 |
#if INCLUDE_JVMCI |
36313
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2140 |
status = status && check_jvmci_args_consistency(); |
e7eff81d7f1d
8145333: -XX:+EnableJVMCI -XX:+UseJVMCICompiler -XX:-EnableJVMCI makes JVM crash
jcm
parents:
36099
diff
changeset
|
2141 |
|
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2142 |
if (EnableJVMCI) { |
44836 | 2143 |
PropertyList_unique_add(&_system_properties, "jdk.internal.vm.ci.enabled", "true", |
2144 |
AddProperty, UnwriteableProperty, InternalProperty); |
|
2145 |
||
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2146 |
if (!ScavengeRootsInCode) { |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2147 |
warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled"); |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2148 |
ScavengeRootsInCode = 1; |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2149 |
} |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2150 |
} |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
2151 |
#endif |
13861
619cff4bfb8b
7188594: Print statistic collected by NMT with VM flag
zgu
parents:
13739
diff
changeset
|
2152 |
|
18506
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2153 |
// Check lower bounds of the code cache |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2154 |
// Template Interpreter code is approximately 3X larger in debug builds. |
27420
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
27171
diff
changeset
|
2155 |
uint min_code_cache_size = CodeCacheMinimumUseSpace DEBUG_ONLY(* 3); |
18506
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2156 |
if (InitialCodeCacheSize < (uintx)os::vm_page_size()) { |
17874
ca460b733b76
8013496: Code cache management command line options work only in special order. Another order of arguments does not deliver the second parameter to the jvm.
anoll
parents:
17617
diff
changeset
|
2157 |
jio_fprintf(defaultStream::error_stream(), |
18506
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2158 |
"Invalid InitialCodeCacheSize=%dK. Must be at least %dK.\n", InitialCodeCacheSize/K, |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2159 |
os::vm_page_size()/K); |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2160 |
status = false; |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2161 |
} else if (ReservedCodeCacheSize < InitialCodeCacheSize) { |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2162 |
jio_fprintf(defaultStream::error_stream(), |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2163 |
"Invalid ReservedCodeCacheSize: %dK. Must be at least InitialCodeCacheSize=%dK.\n", |
17874
ca460b733b76
8013496: Code cache management command line options work only in special order. Another order of arguments does not deliver the second parameter to the jvm.
anoll
parents:
17617
diff
changeset
|
2164 |
ReservedCodeCacheSize/K, InitialCodeCacheSize/K); |
ca460b733b76
8013496: Code cache management command line options work only in special order. Another order of arguments does not deliver the second parameter to the jvm.
anoll
parents:
17617
diff
changeset
|
2165 |
status = false; |
18506
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2166 |
} else if (ReservedCodeCacheSize < min_code_cache_size) { |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2167 |
jio_fprintf(defaultStream::error_stream(), |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2168 |
"Invalid ReservedCodeCacheSize=%dK. Must be at least %uK.\n", ReservedCodeCacheSize/K, |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2169 |
min_code_cache_size/K); |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2170 |
status = false; |
29180 | 2171 |
} else if (ReservedCodeCacheSize > CODE_CACHE_SIZE_LIMIT) { |
2172 |
// Code cache size larger than CODE_CACHE_SIZE_LIMIT is not supported. |
|
18700
293625ae06a2
8015635: Crash when specifying very large code cache size
anoll
parents:
18510
diff
changeset
|
2173 |
jio_fprintf(defaultStream::error_stream(), |
293625ae06a2
8015635: Crash when specifying very large code cache size
anoll
parents:
18510
diff
changeset
|
2174 |
"Invalid ReservedCodeCacheSize=%dM. Must be at most %uM.\n", ReservedCodeCacheSize/M, |
29180 | 2175 |
CODE_CACHE_SIZE_LIMIT/M); |
18700
293625ae06a2
8015635: Crash when specifying very large code cache size
anoll
parents:
18510
diff
changeset
|
2176 |
status = false; |
34182
82d1b1696016
8061436: Processing of options related to segmented code cache should be enhanced
thartmann
parents:
34174
diff
changeset
|
2177 |
} else if (NonNMethodCodeHeapSize < min_code_cache_size) { |
26796 | 2178 |
jio_fprintf(defaultStream::error_stream(), |
26919
361b4b4c92c0
8059468: Fix PrintCodeCache output changed by JDK-8059137
thartmann
parents:
26852
diff
changeset
|
2179 |
"Invalid NonNMethodCodeHeapSize=%dK. Must be at least %uK.\n", NonNMethodCodeHeapSize/K, |
26796 | 2180 |
min_code_cache_size/K); |
2181 |
status = false; |
|
17874
ca460b733b76
8013496: Code cache management command line options work only in special order. Another order of arguments does not deliver the second parameter to the jvm.
anoll
parents:
17617
diff
changeset
|
2182 |
} |
20290
2127dc70bce9
8020151: PSR:PERF Large performance regressions when code cache is filled
anoll
parents:
20288
diff
changeset
|
2183 |
|
36556
7f092a7ce938
8150839: Adjust the number of compiler threads for 32-bit platforms
zmajo
parents:
36350
diff
changeset
|
2184 |
#ifdef _LP64 |
24013
1d16b0f1060d
8029436: CICompilerCount is not updated when the number of compiler threads is adjusted to the number of CPUs
anoll
parents:
23534
diff
changeset
|
2185 |
if (!FLAG_IS_DEFAULT(CICompilerCount) && !FLAG_IS_DEFAULT(CICompilerCountPerCPU) && CICompilerCountPerCPU) { |
1d16b0f1060d
8029436: CICompilerCount is not updated when the number of compiler threads is adjusted to the number of CPUs
anoll
parents:
23534
diff
changeset
|
2186 |
warning("The VM option CICompilerCountPerCPU overrides CICompilerCount."); |
1d16b0f1060d
8029436: CICompilerCount is not updated when the number of compiler threads is adjusted to the number of CPUs
anoll
parents:
23534
diff
changeset
|
2187 |
} |
36556
7f092a7ce938
8150839: Adjust the number of compiler threads for 32-bit platforms
zmajo
parents:
36350
diff
changeset
|
2188 |
#endif |
24013
1d16b0f1060d
8029436: CICompilerCount is not updated when the number of compiler threads is adjusted to the number of CPUs
anoll
parents:
23534
diff
changeset
|
2189 |
|
35071
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
35061
diff
changeset
|
2190 |
#ifndef SUPPORT_RESERVED_STACK_AREA |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
35061
diff
changeset
|
2191 |
if (StackReservedPages != 0) { |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
35061
diff
changeset
|
2192 |
FLAG_SET_CMDLINE(intx, StackReservedPages, 0); |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
35061
diff
changeset
|
2193 |
warning("Reserved Stack Area not supported on this platform"); |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
35061
diff
changeset
|
2194 |
} |
a0910b1d3e0d
8046936: JEP 270: Reserved Stack Areas for Critical Sections
fparain
parents:
35061
diff
changeset
|
2195 |
#endif |
36807
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36594
diff
changeset
|
2196 |
|
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36594
diff
changeset
|
2197 |
if (BackgroundCompilation && (CompileTheWorld || ReplayCompiles)) { |
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36594
diff
changeset
|
2198 |
if (!FLAG_IS_DEFAULT(BackgroundCompilation)) { |
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36594
diff
changeset
|
2199 |
warning("BackgroundCompilation disabled due to CompileTheWorld or ReplayCompiles options."); |
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36594
diff
changeset
|
2200 |
} |
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36594
diff
changeset
|
2201 |
FLAG_SET_CMDLINE(bool, BackgroundCompilation, false); |
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36594
diff
changeset
|
2202 |
} |
38055
9dddf9056918
8086068: VM crashes with "-Xint -XX:+UseCompiler" options
thartmann
parents:
38051
diff
changeset
|
2203 |
if (UseCompiler && is_interpreter_only()) { |
9dddf9056918
8086068: VM crashes with "-Xint -XX:+UseCompiler" options
thartmann
parents:
38051
diff
changeset
|
2204 |
if (!FLAG_IS_DEFAULT(UseCompiler)) { |
9dddf9056918
8086068: VM crashes with "-Xint -XX:+UseCompiler" options
thartmann
parents:
38051
diff
changeset
|
2205 |
warning("UseCompiler disabled due to -Xint."); |
9dddf9056918
8086068: VM crashes with "-Xint -XX:+UseCompiler" options
thartmann
parents:
38051
diff
changeset
|
2206 |
} |
9dddf9056918
8086068: VM crashes with "-Xint -XX:+UseCompiler" options
thartmann
parents:
38051
diff
changeset
|
2207 |
FLAG_SET_CMDLINE(bool, UseCompiler, false); |
9dddf9056918
8086068: VM crashes with "-Xint -XX:+UseCompiler" options
thartmann
parents:
38051
diff
changeset
|
2208 |
} |
38129
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2209 |
#ifdef COMPILER2 |
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2210 |
if (PostLoopMultiversioning && !RangeCheckElimination) { |
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2211 |
if (!FLAG_IS_DEFAULT(PostLoopMultiversioning)) { |
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2212 |
warning("PostLoopMultiversioning disabled because RangeCheckElimination is disabled."); |
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2213 |
} |
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2214 |
FLAG_SET_CMDLINE(bool, PostLoopMultiversioning, false); |
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2215 |
} |
7adeefaa6d1d
8154763: Crash with "assert(RangeCheckElimination)" if RangeCheckElimination is disabled
thartmann
parents:
38055
diff
changeset
|
2216 |
#endif |
1 | 2217 |
return status; |
2218 |
} |
|
2219 |
||
2220 |
bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore, |
|
2221 |
const char* option_type) { |
|
2222 |
if (ignore) return false; |
|
2223 |
||
2224 |
const char* spacer = " "; |
|
2225 |
if (option_type == NULL) { |
|
2226 |
option_type = ++spacer; // Set both to the empty string. |
|
2227 |
} |
|
2228 |
||
2229 |
if (os::obsolete_option(option)) { |
|
2230 |
jio_fprintf(defaultStream::error_stream(), |
|
2231 |
"Obsolete %s%soption: %s\n", option_type, spacer, |
|
2232 |
option->optionString); |
|
2233 |
return false; |
|
2234 |
} else { |
|
2235 |
jio_fprintf(defaultStream::error_stream(), |
|
2236 |
"Unrecognized %s%soption: %s\n", option_type, spacer, |
|
2237 |
option->optionString); |
|
2238 |
return true; |
|
2239 |
} |
|
2240 |
} |
|
2241 |
||
2242 |
static const char* user_assertion_options[] = { |
|
2243 |
"-da", "-ea", "-disableassertions", "-enableassertions", 0 |
|
2244 |
}; |
|
2245 |
||
2246 |
static const char* system_assertion_options[] = { |
|
2247 |
"-dsa", "-esa", "-disablesystemassertions", "-enablesystemassertions", 0 |
|
2248 |
}; |
|
2249 |
||
5035 | 2250 |
bool Arguments::parse_uintx(const char* value, |
2251 |
uintx* uintx_arg, |
|
2252 |
uintx min_size) { |
|
2253 |
||
38195 | 2254 |
// Check the sign first since atojulong() parses only unsigned values. |
5035 | 2255 |
bool value_is_positive = !(*value == '-'); |
2256 |
||
2257 |
if (value_is_positive) { |
|
2258 |
julong n; |
|
38195 | 2259 |
bool good_return = atojulong(value, &n); |
5035 | 2260 |
if (good_return) { |
2261 |
bool above_minimum = n >= min_size; |
|
2262 |
bool value_is_too_large = n > max_uintx; |
|
2263 |
||
2264 |
if (above_minimum && !value_is_too_large) { |
|
2265 |
*uintx_arg = n; |
|
2266 |
return true; |
|
2267 |
} |
|
2268 |
} |
|
2269 |
} |
|
2270 |
return false; |
|
2271 |
} |
|
2272 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2273 |
unsigned int addreads_count = 0; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2274 |
unsigned int addexports_count = 0; |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
2275 |
unsigned int addopens_count = 0; |
41073
ed43eecbd166
8165634: Support multiple --add-modules options on the command line
hseigel
parents:
40924
diff
changeset
|
2276 |
unsigned int addmods_count = 0; |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2277 |
unsigned int patch_mod_count = 0; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2278 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2279 |
bool Arguments::create_property(const char* prop_name, const char* prop_value, PropertyInternal internal) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2280 |
size_t prop_len = strlen(prop_name) + strlen(prop_value) + 2; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2281 |
char* property = AllocateHeap(prop_len, mtArguments); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2282 |
int ret = jio_snprintf(property, prop_len, "%s=%s", prop_name, prop_value); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2283 |
if (ret < 0 || ret >= (int)prop_len) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2284 |
FreeHeap(property); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2285 |
return false; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2286 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2287 |
bool added = add_property(property, UnwriteableProperty, internal); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2288 |
FreeHeap(property); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2289 |
return added; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2290 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2291 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2292 |
bool Arguments::create_numbered_property(const char* prop_base_name, const char* prop_value, unsigned int count) { |
46367
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2293 |
const unsigned int props_count_limit = 1000; |
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2294 |
const int max_digits = 3; |
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2295 |
const int extra_symbols_count = 3; // includes '.', '=', '\0' |
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2296 |
|
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2297 |
// Make sure count is < props_count_limit. Otherwise, memory allocation will be too small. |
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2298 |
if (count < props_count_limit) { |
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2299 |
size_t prop_len = strlen(prop_base_name) + strlen(prop_value) + max_digits + extra_symbols_count; |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2300 |
char* property = AllocateHeap(prop_len, mtArguments); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2301 |
int ret = jio_snprintf(property, prop_len, "%s.%d=%s", prop_base_name, count, prop_value); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2302 |
if (ret < 0 || ret >= (int)prop_len) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2303 |
FreeHeap(property); |
46367
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2304 |
jio_fprintf(defaultStream::error_stream(), "Failed to create property %s.%d=%s\n", prop_base_name, count, prop_value); |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2305 |
return false; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2306 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2307 |
bool added = add_property(property, UnwriteableProperty, InternalProperty); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2308 |
FreeHeap(property); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2309 |
return added; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2310 |
} |
46367
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2311 |
|
6e532778cb35
8178118: Arguments::create_numbered_property allocates wrong buffer in case count > 99
iignatyev
parents:
44203
diff
changeset
|
2312 |
jio_fprintf(defaultStream::error_stream(), "Property count limit exceeded: %s, limit=%d\n", prop_base_name, props_count_limit); |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2313 |
return false; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2314 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2315 |
|
1 | 2316 |
Arguments::ArgsRange Arguments::parse_memory_size(const char* s, |
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
2317 |
julong* long_arg, |
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2318 |
julong min_size, |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2319 |
julong max_size) { |
38195 | 2320 |
if (!atojulong(s, long_arg)) return arg_unreadable; |
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2321 |
return check_memory_size(*long_arg, min_size, max_size); |
1 | 2322 |
} |
2323 |
||
2324 |
// Parse JavaVMInitArgs structure |
|
2325 |
||
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2326 |
jint Arguments::parse_vm_init_args(const JavaVMInitArgs *java_tool_options_args, |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2327 |
const JavaVMInitArgs *java_options_args, |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2328 |
const JavaVMInitArgs *cmd_line_args) { |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2329 |
bool patch_mod_javabase = false; |
1 | 2330 |
|
2331 |
// Save default settings for some mode flags |
|
2332 |
Arguments::_AlwaysCompileLoopMethods = AlwaysCompileLoopMethods; |
|
2333 |
Arguments::_UseOnStackReplacement = UseOnStackReplacement; |
|
2334 |
Arguments::_ClipInlining = ClipInlining; |
|
2335 |
Arguments::_BackgroundCompilation = BackgroundCompilation; |
|
30201
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
2336 |
if (TieredCompilation) { |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
2337 |
Arguments::_Tier3InvokeNotifyFreqLog = Tier3InvokeNotifyFreqLog; |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
2338 |
Arguments::_Tier4InvocationThreshold = Tier4InvocationThreshold; |
cfe623bb3f9c
8075663: compiler/rangechecks/TestExplicitRangeChecks.java fails in compiler nightlies
roland
parents:
29697
diff
changeset
|
2339 |
} |
1 | 2340 |
|
9442
6aaa5529f807
7041582: set_mode_flags isn't called without -Xmixed specified
never
parents:
9187
diff
changeset
|
2341 |
// Setup flags for mixed which is the default |
6aaa5529f807
7041582: set_mode_flags isn't called without -Xmixed specified
never
parents:
9187
diff
changeset
|
2342 |
set_mode_flags(_mixed); |
6aaa5529f807
7041582: set_mode_flags isn't called without -Xmixed specified
never
parents:
9187
diff
changeset
|
2343 |
|
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2344 |
// Parse args structure generated from JAVA_TOOL_OPTIONS environment |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2345 |
// variable (if present). |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2346 |
jint result = parse_each_vm_init_arg(java_tool_options_args, &patch_mod_javabase, Flag::ENVIRON_VAR); |
1 | 2347 |
if (result != JNI_OK) { |
2348 |
return result; |
|
2349 |
} |
|
2350 |
||
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2351 |
// Parse args structure generated from the command line flags. |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2352 |
result = parse_each_vm_init_arg(cmd_line_args, &patch_mod_javabase, Flag::COMMAND_LINE); |
1 | 2353 |
if (result != JNI_OK) { |
2354 |
return result; |
|
2355 |
} |
|
2356 |
||
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2357 |
// Parse args structure generated from the _JAVA_OPTIONS environment |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
2358 |
// variable (if present) (mimics classic VM) |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2359 |
result = parse_each_vm_init_arg(java_options_args, &patch_mod_javabase, Flag::ENVIRON_VAR); |
1 | 2360 |
if (result != JNI_OK) { |
2361 |
return result; |
|
2362 |
} |
|
2363 |
||
47903
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2364 |
// We need to ensure processor and memory resources have been properly |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2365 |
// configured - which may rely on arguments we just processed - before |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2366 |
// doing the final argument processing. Any argument processing that |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2367 |
// needs to know about processor and memory resources must occur after |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2368 |
// this point. |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2369 |
|
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2370 |
os::init_container_support(); |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
2371 |
|
1 | 2372 |
// Do final processing now that all arguments have been parsed |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
2373 |
result = finalize_vm_init_args(patch_mod_javabase); |
1 | 2374 |
if (result != JNI_OK) { |
2375 |
return result; |
|
2376 |
} |
|
2377 |
||
2378 |
return JNI_OK; |
|
2379 |
} |
|
2380 |
||
17096
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2381 |
// Checks if name in command-line argument -agent{lib,path}:name[=options] |
32200 | 2382 |
// represents a valid JDWP agent. is_path==true denotes that we |
17096
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2383 |
// are dealing with -agentpath (case where name is a path), otherwise with |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2384 |
// -agentlib |
32200 | 2385 |
bool valid_jdwp_agent(char *name, bool is_path) { |
17096
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2386 |
char *_name; |
32200 | 2387 |
const char *_jdwp = "jdwp"; |
2388 |
size_t _len_jdwp, _len_prefix; |
|
17096
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2389 |
|
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2390 |
if (is_path) { |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2391 |
if ((_name = strrchr(name, (int) *os::file_separator())) == NULL) { |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2392 |
return false; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2393 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2394 |
|
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2395 |
_name++; // skip past last path separator |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2396 |
_len_prefix = strlen(JNI_LIB_PREFIX); |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2397 |
|
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2398 |
if (strncmp(_name, JNI_LIB_PREFIX, _len_prefix) != 0) { |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2399 |
return false; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2400 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2401 |
|
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2402 |
_name += _len_prefix; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2403 |
_len_jdwp = strlen(_jdwp); |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2404 |
|
32200 | 2405 |
if (strncmp(_name, _jdwp, _len_jdwp) == 0) { |
17096
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2406 |
_name += _len_jdwp; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2407 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2408 |
else { |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2409 |
return false; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2410 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2411 |
|
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2412 |
if (strcmp(_name, JNI_LIB_SUFFIX) != 0) { |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2413 |
return false; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2414 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2415 |
|
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2416 |
return true; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2417 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2418 |
|
32200 | 2419 |
if (strcmp(name, _jdwp) == 0) { |
17096
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2420 |
return true; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2421 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2422 |
|
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2423 |
return false; |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2424 |
} |
1cfa436cf2fd
8010428: Special -agentpath checks needed with minimal VM to produce proper error message
dholmes
parents:
16686
diff
changeset
|
2425 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2426 |
int Arguments::process_patch_mod_option(const char* patch_mod_tail, bool* patch_mod_javabase) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2427 |
// --patch-module=<module>=<file>(<pathsep><file>)* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2428 |
assert(patch_mod_tail != NULL, "Unexpected NULL patch-module value"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2429 |
// Find the equal sign between the module name and the path specification |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2430 |
const char* module_equal = strchr(patch_mod_tail, '='); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2431 |
if (module_equal == NULL) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2432 |
jio_fprintf(defaultStream::output_stream(), "Missing '=' in --patch-module specification\n"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2433 |
return JNI_ERR; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2434 |
} else { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2435 |
// Pick out the module name |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2436 |
size_t module_len = module_equal - patch_mod_tail; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2437 |
char* module_name = NEW_C_HEAP_ARRAY_RETURN_NULL(char, module_len+1, mtArguments); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2438 |
if (module_name != NULL) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2439 |
memcpy(module_name, patch_mod_tail, module_len); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2440 |
*(module_name + module_len) = '\0'; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2441 |
// The path piece begins one past the module_equal sign |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2442 |
add_patch_mod_prefix(module_name, module_equal + 1, patch_mod_javabase); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2443 |
FREE_C_HEAP_ARRAY(char, module_name); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2444 |
if (!create_numbered_property("jdk.module.patch", patch_mod_tail, patch_mod_count++)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2445 |
return JNI_ENOMEM; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2446 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2447 |
} else { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2448 |
return JNI_ENOMEM; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2449 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2450 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2451 |
return JNI_OK; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2452 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2453 |
|
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2454 |
// Parse -Xss memory string parameter and convert to ThreadStackSize in K. |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2455 |
jint Arguments::parse_xss(const JavaVMOption* option, const char* tail, intx* out_ThreadStackSize) { |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2456 |
// The min and max sizes match the values in globals.hpp, but scaled |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2457 |
// with K. The values have been chosen so that alignment with page |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2458 |
// size doesn't change the max value, which makes the conversions |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2459 |
// back and forth between Xss value and ThreadStackSize value easier. |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2460 |
// The values have also been chosen to fit inside a 32-bit signed type. |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2461 |
const julong min_ThreadStackSize = 0; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2462 |
const julong max_ThreadStackSize = 1 * M; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2463 |
|
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2464 |
const julong min_size = min_ThreadStackSize * K; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2465 |
const julong max_size = max_ThreadStackSize * K; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2466 |
|
46622
910fc72c03e8
8178501: Replace usages of align macros with calls to the align inline functions
stefank
parents:
46619
diff
changeset
|
2467 |
assert(is_aligned(max_size, os::vm_page_size()), "Implementation assumption"); |
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2468 |
|
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2469 |
julong size = 0; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2470 |
ArgsRange errcode = parse_memory_size(tail, &size, min_size, max_size); |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2471 |
if (errcode != arg_in_range) { |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2472 |
bool silent = (option == NULL); // Allow testing to silence error messages |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2473 |
if (!silent) { |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2474 |
jio_fprintf(defaultStream::error_stream(), |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2475 |
"Invalid thread stack size: %s\n", option->optionString); |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2476 |
describe_range_error(errcode); |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2477 |
} |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2478 |
return JNI_EINVAL; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2479 |
} |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2480 |
|
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2481 |
// Internally track ThreadStackSize in units of 1024 bytes. |
46622
910fc72c03e8
8178501: Replace usages of align macros with calls to the align inline functions
stefank
parents:
46619
diff
changeset
|
2482 |
const julong size_aligned = align_up(size, K); |
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2483 |
assert(size <= size_aligned, |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2484 |
"Overflow: " JULONG_FORMAT " " JULONG_FORMAT, |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2485 |
size, size_aligned); |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2486 |
|
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2487 |
const julong size_in_K = size_aligned / K; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2488 |
assert(size_in_K < (julong)max_intx, |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2489 |
"size_in_K doesn't fit in the type of ThreadStackSize: " JULONG_FORMAT, |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2490 |
size_in_K); |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2491 |
|
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2492 |
// Check that code expanding ThreadStackSize to a page aligned number of bytes won't overflow. |
46622
910fc72c03e8
8178501: Replace usages of align macros with calls to the align inline functions
stefank
parents:
46619
diff
changeset
|
2493 |
const julong max_expanded = align_up(size_in_K * K, os::vm_page_size()); |
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2494 |
assert(max_expanded < max_uintx && max_expanded >= size_in_K, |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2495 |
"Expansion overflowed: " JULONG_FORMAT " " JULONG_FORMAT, |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2496 |
max_expanded, size_in_K); |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2497 |
|
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2498 |
*out_ThreadStackSize = (intx)size_in_K; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2499 |
|
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2500 |
return JNI_OK; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2501 |
} |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2502 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2503 |
jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_mod_javabase, Flag::Flags origin) { |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
2504 |
// For match_option to return remaining or value part of option string |
1 | 2505 |
const char* tail; |
2506 |
||
2507 |
// iterate over arguments |
|
2508 |
for (int index = 0; index < args->nOptions; index++) { |
|
2509 |
bool is_absolute_path = false; // for -agentpath vs -agentlib |
|
2510 |
||
35489 | 2511 |
const JavaVMOption* option = args->options + index; |
1 | 2512 |
|
2513 |
if (!match_option(option, "-Djava.class.path", &tail) && |
|
2514 |
!match_option(option, "-Dsun.java.command", &tail) && |
|
2515 |
!match_option(option, "-Dsun.java.launcher", &tail)) { |
|
2516 |
||
2517 |
// add all jvm options to the jvm_args string. This string |
|
2518 |
// is used later to set the java.vm.args PerfData string constant. |
|
2519 |
// the -Djava.class.path and the -Dsun.java.command options are |
|
2520 |
// omitted from jvm_args string as each have their own PerfData |
|
2521 |
// string constant object. |
|
2522 |
build_jvm_args(option->optionString); |
|
2523 |
} |
|
2524 |
||
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44741
diff
changeset
|
2525 |
// -verbose:[class/module/gc/jni] |
1 | 2526 |
if (match_option(option, "-verbose", &tail)) { |
2527 |
if (!strcmp(tail, ":class") || !strcmp(tail, "")) { |
|
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
2528 |
LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(class, load)); |
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
2529 |
LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(class, unload)); |
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44741
diff
changeset
|
2530 |
} else if (!strcmp(tail, ":module")) { |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44741
diff
changeset
|
2531 |
LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(module, load)); |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44741
diff
changeset
|
2532 |
LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(module, unload)); |
1 | 2533 |
} else if (!strcmp(tail, ":gc")) { |
35520
0efb779f41a5
8147464: Use LogConfiguration::configure_stdout() instead of parse_log_arguments
brutisso
parents:
35495
diff
changeset
|
2534 |
LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(gc)); |
1 | 2535 |
} else if (!strcmp(tail, ":jni")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2536 |
if (FLAG_SET_CMDLINE(bool, PrintJNIResolving, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2537 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2538 |
} |
1 | 2539 |
} |
2540 |
// -da / -ea / -disableassertions / -enableassertions |
|
2541 |
// These accept an optional class/package name separated by a colon, e.g., |
|
2542 |
// -da:java.lang.Thread. |
|
2543 |
} else if (match_option(option, user_assertion_options, &tail, true)) { |
|
2544 |
bool enable = option->optionString[1] == 'e'; // char after '-' is 'e' |
|
2545 |
if (*tail == '\0') { |
|
2546 |
JavaAssertions::setUserClassDefault(enable); |
|
2547 |
} else { |
|
2548 |
assert(*tail == ':', "bogus match by match_option()"); |
|
2549 |
JavaAssertions::addOption(tail + 1, enable); |
|
2550 |
} |
|
2551 |
// -dsa / -esa / -disablesystemassertions / -enablesystemassertions |
|
2552 |
} else if (match_option(option, system_assertion_options, &tail, false)) { |
|
2553 |
bool enable = option->optionString[1] == 'e'; // char after '-' is 'e' |
|
2554 |
JavaAssertions::setSystemClassDefault(enable); |
|
2555 |
// -bootclasspath: |
|
2556 |
} else if (match_option(option, "-Xbootclasspath:", &tail)) { |
|
36508 | 2557 |
jio_fprintf(defaultStream::output_stream(), |
2558 |
"-Xbootclasspath is no longer a supported option.\n"); |
|
2559 |
return JNI_EINVAL; |
|
1 | 2560 |
// -bootclasspath/a: |
2561 |
} else if (match_option(option, "-Xbootclasspath/a:", &tail)) { |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
2562 |
Arguments::append_sysclasspath(tail); |
1 | 2563 |
// -bootclasspath/p: |
2564 |
} else if (match_option(option, "-Xbootclasspath/p:", &tail)) { |
|
36508 | 2565 |
jio_fprintf(defaultStream::output_stream(), |
2566 |
"-Xbootclasspath/p is no longer a supported option.\n"); |
|
2567 |
return JNI_EINVAL; |
|
1 | 2568 |
// -Xrun |
2569 |
} else if (match_option(option, "-Xrun", &tail)) { |
|
1907
405ab5976b58
6792705: Add JAR file to bootclasspath when using AggressiveOpts
phh
parents:
1889
diff
changeset
|
2570 |
if (tail != NULL) { |
1 | 2571 |
const char* pos = strchr(tail, ':'); |
2572 |
size_t len = (pos == NULL) ? strlen(tail) : pos - tail; |
|
41540 | 2573 |
char* name = NEW_C_HEAP_ARRAY(char, len + 1, mtArguments); |
2574 |
jio_snprintf(name, len + 1, "%s", tail); |
|
1 | 2575 |
|
2576 |
char *options = NULL; |
|
2577 |
if(pos != NULL) { |
|
2578 |
size_t len2 = strlen(pos+1) + 1; // options start after ':'. Final zero must be copied. |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
2579 |
options = (char*)memcpy(NEW_C_HEAP_ARRAY(char, len2, mtArguments), pos+1, len2); |
1 | 2580 |
} |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2581 |
#if !INCLUDE_JVMTI |
32200 | 2582 |
if (strcmp(name, "jdwp") == 0) { |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2583 |
jio_fprintf(defaultStream::error_stream(), |
32200 | 2584 |
"Debugging agents are not supported in this VM\n"); |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2585 |
return JNI_ERR; |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2586 |
} |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2587 |
#endif // !INCLUDE_JVMTI |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2588 |
add_init_library(name, options); |
1 | 2589 |
} |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2590 |
} else if (match_option(option, "--add-reads=", &tail)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2591 |
if (!create_numbered_property("jdk.module.addreads", tail, addreads_count++)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2592 |
return JNI_ENOMEM; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2593 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2594 |
} else if (match_option(option, "--add-exports=", &tail)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2595 |
if (!create_numbered_property("jdk.module.addexports", tail, addexports_count++)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2596 |
return JNI_ENOMEM; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2597 |
} |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
2598 |
} else if (match_option(option, "--add-opens=", &tail)) { |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
2599 |
if (!create_numbered_property("jdk.module.addopens", tail, addopens_count++)) { |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
2600 |
return JNI_ENOMEM; |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41744
diff
changeset
|
2601 |
} |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2602 |
} else if (match_option(option, "--add-modules=", &tail)) { |
41073
ed43eecbd166
8165634: Support multiple --add-modules options on the command line
hseigel
parents:
40924
diff
changeset
|
2603 |
if (!create_numbered_property("jdk.module.addmods", tail, addmods_count++)) { |
ed43eecbd166
8165634: Support multiple --add-modules options on the command line
hseigel
parents:
40924
diff
changeset
|
2604 |
return JNI_ENOMEM; |
ed43eecbd166
8165634: Support multiple --add-modules options on the command line
hseigel
parents:
40924
diff
changeset
|
2605 |
} |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2606 |
} else if (match_option(option, "--limit-modules=", &tail)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2607 |
if (!create_property("jdk.module.limitmods", tail, InternalProperty)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2608 |
return JNI_ENOMEM; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2609 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2610 |
} else if (match_option(option, "--module-path=", &tail)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2611 |
if (!create_property("jdk.module.path", tail, ExternalProperty)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2612 |
return JNI_ENOMEM; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2613 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2614 |
} else if (match_option(option, "--upgrade-module-path=", &tail)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2615 |
if (!create_property("jdk.module.upgrade.path", tail, ExternalProperty)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2616 |
return JNI_ENOMEM; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2617 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2618 |
} else if (match_option(option, "--patch-module=", &tail)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2619 |
// --patch-module=<module>=<file>(<pathsep><file>)* |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2620 |
int res = process_patch_mod_option(tail, patch_mod_javabase); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2621 |
if (res != JNI_OK) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2622 |
return res; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2623 |
} |
45628
ea212c4584d7
8181087: Module system implementation refresh (6/2017)
alanb
parents:
44994
diff
changeset
|
2624 |
} else if (match_option(option, "--illegal-access=", &tail)) { |
ea212c4584d7
8181087: Module system implementation refresh (6/2017)
alanb
parents:
44994
diff
changeset
|
2625 |
if (!create_property("jdk.module.illegalAccess", tail, ExternalProperty)) { |
44326
6c59cca7ff07
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43972
diff
changeset
|
2626 |
return JNI_ENOMEM; |
6c59cca7ff07
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43972
diff
changeset
|
2627 |
} |
1 | 2628 |
// -agentlib and -agentpath |
2629 |
} else if (match_option(option, "-agentlib:", &tail) || |
|
2630 |
(is_absolute_path = match_option(option, "-agentpath:", &tail))) { |
|
2631 |
if(tail != NULL) { |
|
2632 |
const char* pos = strchr(tail, '='); |
|
2633 |
size_t len = (pos == NULL) ? strlen(tail) : pos - tail; |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
2634 |
char* name = strncpy(NEW_C_HEAP_ARRAY(char, len + 1, mtArguments), tail, len); |
1 | 2635 |
name[len] = '\0'; |
2636 |
||
2637 |
char *options = NULL; |
|
2638 |
if(pos != NULL) { |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
2639 |
options = os::strdup_check_oom(pos + 1, mtArguments); |
1 | 2640 |
} |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2641 |
#if !INCLUDE_JVMTI |
32200 | 2642 |
if (valid_jdwp_agent(name, is_absolute_path)) { |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2643 |
jio_fprintf(defaultStream::error_stream(), |
32200 | 2644 |
"Debugging agents are not supported in this VM\n"); |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2645 |
return JNI_ERR; |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2646 |
} |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2647 |
#endif // !INCLUDE_JVMTI |
1 | 2648 |
add_init_agent(name, options, is_absolute_path); |
2649 |
} |
|
2650 |
// -javaagent |
|
2651 |
} else if (match_option(option, "-javaagent:", &tail)) { |
|
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2652 |
#if !INCLUDE_JVMTI |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2653 |
jio_fprintf(defaultStream::error_stream(), |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2654 |
"Instrumentation agents are not supported in this VM\n"); |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2655 |
return JNI_ERR; |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2656 |
#else |
36508 | 2657 |
if (tail != NULL) { |
41540 | 2658 |
size_t length = strlen(tail) + 1; |
2659 |
char *options = NEW_C_HEAP_ARRAY(char, length, mtArguments); |
|
2660 |
jio_snprintf(options, length, "%s", tail); |
|
1 | 2661 |
add_init_agent("instrument", options, false); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
2662 |
// java agents need module java.instrument |
41073
ed43eecbd166
8165634: Support multiple --add-modules options on the command line
hseigel
parents:
40924
diff
changeset
|
2663 |
if (!create_numbered_property("jdk.module.addmods", "java.instrument", addmods_count++)) { |
36508 | 2664 |
return JNI_ENOMEM; |
2665 |
} |
|
1 | 2666 |
} |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
2667 |
#endif // !INCLUDE_JVMTI |
1 | 2668 |
// -Xnoclassgc |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2669 |
} else if (match_option(option, "-Xnoclassgc")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2670 |
if (FLAG_SET_CMDLINE(bool, ClassUnloading, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2671 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2672 |
} |
1 | 2673 |
// -Xconcgc |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2674 |
} else if (match_option(option, "-Xconcgc")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2675 |
if (FLAG_SET_CMDLINE(bool, UseConcMarkSweepGC, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2676 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2677 |
} |
41708
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
2678 |
handle_extra_cms_flags("-Xconcgc uses UseConcMarkSweepGC"); |
1 | 2679 |
// -Xnoconcgc |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2680 |
} else if (match_option(option, "-Xnoconcgc")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2681 |
if (FLAG_SET_CMDLINE(bool, UseConcMarkSweepGC, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2682 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2683 |
} |
41708
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
2684 |
handle_extra_cms_flags("-Xnoconcgc uses UseConcMarkSweepGC"); |
1 | 2685 |
// -Xbatch |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2686 |
} else if (match_option(option, "-Xbatch")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2687 |
if (FLAG_SET_CMDLINE(bool, BackgroundCompilation, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2688 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2689 |
} |
1 | 2690 |
// -Xmn for compatibility with other JVM vendors |
2691 |
} else if (match_option(option, "-Xmn", &tail)) { |
|
20399 | 2692 |
julong long_initial_young_size = 0; |
2693 |
ArgsRange errcode = parse_memory_size(tail, &long_initial_young_size, 1); |
|
1 | 2694 |
if (errcode != arg_in_range) { |
2695 |
jio_fprintf(defaultStream::error_stream(), |
|
20399 | 2696 |
"Invalid initial young generation size: %s\n", option->optionString); |
1 | 2697 |
describe_range_error(errcode); |
2698 |
return JNI_EINVAL; |
|
2699 |
} |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2700 |
if (FLAG_SET_CMDLINE(size_t, MaxNewSize, (size_t)long_initial_young_size) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2701 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2702 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2703 |
if (FLAG_SET_CMDLINE(size_t, NewSize, (size_t)long_initial_young_size) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2704 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2705 |
} |
1 | 2706 |
// -Xms |
2707 |
} else if (match_option(option, "-Xms", &tail)) { |
|
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
2708 |
julong long_initial_heap_size = 0; |
17322
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
2709 |
// an initial heap size of 0 means automatically determine |
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
2710 |
ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 0); |
1 | 2711 |
if (errcode != arg_in_range) { |
2712 |
jio_fprintf(defaultStream::error_stream(), |
|
2713 |
"Invalid initial heap size: %s\n", option->optionString); |
|
2714 |
describe_range_error(errcode); |
|
2715 |
return JNI_EINVAL; |
|
2716 |
} |
|
29697
92501504191b
8074459: Flags handling memory sizes should be of type size_t
jwilhelm
parents:
29696
diff
changeset
|
2717 |
set_min_heap_size((size_t)long_initial_heap_size); |
1 | 2718 |
// Currently the minimum size and the initial heap sizes are the same. |
21560
b3ae3ba25ebb
8026853: Prepare GC code for collector policy regression fix
jwilhelm
parents:
21196
diff
changeset
|
2719 |
// Can be overridden with -XX:InitialHeapSize. |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2720 |
if (FLAG_SET_CMDLINE(size_t, InitialHeapSize, (size_t)long_initial_heap_size) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2721 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2722 |
} |
1 | 2723 |
// -Xmx |
17322
35c488005999
8006088: Incompatible heap size flags accepted by VM
tschatzl
parents:
17321
diff
changeset
|
2724 |
} else if (match_option(option, "-Xmx", &tail) || match_option(option, "-XX:MaxHeapSize=", &tail)) { |
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
2725 |
julong long_max_heap_size = 0; |
1 | 2726 |
ArgsRange errcode = parse_memory_size(tail, &long_max_heap_size, 1); |
2727 |
if (errcode != arg_in_range) { |
|
2728 |
jio_fprintf(defaultStream::error_stream(), |
|
2729 |
"Invalid maximum heap size: %s\n", option->optionString); |
|
2730 |
describe_range_error(errcode); |
|
2731 |
return JNI_EINVAL; |
|
2732 |
} |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2733 |
if (FLAG_SET_CMDLINE(size_t, MaxHeapSize, (size_t)long_max_heap_size) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2734 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2735 |
} |
1 | 2736 |
// Xmaxf |
2737 |
} else if (match_option(option, "-Xmaxf", &tail)) { |
|
20723
929cc8568f8e
8025661: Ill-formed -Xminf and -Xmaxf options values interpreted as 0
sjohanss
parents:
20408
diff
changeset
|
2738 |
char* err; |
929cc8568f8e
8025661: Ill-formed -Xminf and -Xmaxf options values interpreted as 0
sjohanss
parents:
20408
diff
changeset
|
2739 |
int maxf = (int)(strtod(tail, &err) * 100); |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2740 |
if (*err != '\0' || *tail == '\0') { |
1 | 2741 |
jio_fprintf(defaultStream::error_stream(), |
2742 |
"Bad max heap free percentage size: %s\n", |
|
2743 |
option->optionString); |
|
2744 |
return JNI_EINVAL; |
|
2745 |
} else { |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2746 |
if (FLAG_SET_CMDLINE(uintx, MaxHeapFreeRatio, maxf) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2747 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2748 |
} |
1 | 2749 |
} |
2750 |
// Xminf |
|
2751 |
} else if (match_option(option, "-Xminf", &tail)) { |
|
20723
929cc8568f8e
8025661: Ill-formed -Xminf and -Xmaxf options values interpreted as 0
sjohanss
parents:
20408
diff
changeset
|
2752 |
char* err; |
929cc8568f8e
8025661: Ill-formed -Xminf and -Xmaxf options values interpreted as 0
sjohanss
parents:
20408
diff
changeset
|
2753 |
int minf = (int)(strtod(tail, &err) * 100); |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2754 |
if (*err != '\0' || *tail == '\0') { |
1 | 2755 |
jio_fprintf(defaultStream::error_stream(), |
2756 |
"Bad min heap free percentage size: %s\n", |
|
2757 |
option->optionString); |
|
2758 |
return JNI_EINVAL; |
|
2759 |
} else { |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2760 |
if (FLAG_SET_CMDLINE(uintx, MinHeapFreeRatio, minf) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2761 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2762 |
} |
1 | 2763 |
} |
2764 |
// -Xss |
|
2765 |
} else if (match_option(option, "-Xss", &tail)) { |
|
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2766 |
intx value = 0; |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2767 |
jint err = parse_xss(option, tail, &value); |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2768 |
if (err != JNI_OK) { |
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2769 |
return err; |
1 | 2770 |
} |
46616
66d452cca30f
8178491: -Xss and -XX:ThreadStackSize argument parsing truncates bits
stefank
parents:
46560
diff
changeset
|
2771 |
if (FLAG_SET_CMDLINE(intx, ThreadStackSize, value) != Flag::SUCCESS) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2772 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2773 |
} |
18506
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2774 |
} else if (match_option(option, "-XX:CodeCacheExpansionSize=", &tail)) { |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2775 |
julong long_CodeCacheExpansionSize = 0; |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2776 |
ArgsRange errcode = parse_memory_size(tail, &long_CodeCacheExpansionSize, os::vm_page_size()); |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2777 |
if (errcode != arg_in_range) { |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2778 |
jio_fprintf(defaultStream::error_stream(), |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2779 |
"Invalid argument: %s. Must be at least %luK.\n", option->optionString, |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2780 |
os::vm_page_size()/K); |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2781 |
return JNI_EINVAL; |
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2782 |
} |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2783 |
if (FLAG_SET_CMDLINE(uintx, CodeCacheExpansionSize, (uintx)long_CodeCacheExpansionSize) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2784 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2785 |
} |
7719
ef138e2849eb
6302804: Hotspot VM dies ungraceful death when C heap is exhausted in various places.
coleenp
parents:
7427
diff
changeset
|
2786 |
} else if (match_option(option, "-Xmaxjitcodesize", &tail) || |
ef138e2849eb
6302804: Hotspot VM dies ungraceful death when C heap is exhausted in various places.
coleenp
parents:
7427
diff
changeset
|
2787 |
match_option(option, "-XX:ReservedCodeCacheSize=", &tail)) { |
1676
d80e69372634
6653214: MemoryPoolMXBean.setUsageThreshold() does not support large heap sizes.
swamyv
parents:
1670
diff
changeset
|
2788 |
julong long_ReservedCodeCacheSize = 0; |
18506
af8765fafc07
8014972: Crash with specific values for -XX:InitialCodeCacheSize=500K -XX:ReservedCodeCacheSize=500k
anoll
parents:
18106
diff
changeset
|
2789 |
|
17874
ca460b733b76
8013496: Code cache management command line options work only in special order. Another order of arguments does not deliver the second parameter to the jvm.
anoll
parents:
17617
diff
changeset
|
2790 |
ArgsRange errcode = parse_memory_size(tail, &long_ReservedCodeCacheSize, 1); |
1 | 2791 |
if (errcode != arg_in_range) { |
2792 |
jio_fprintf(defaultStream::error_stream(), |
|
17874
ca460b733b76
8013496: Code cache management command line options work only in special order. Another order of arguments does not deliver the second parameter to the jvm.
anoll
parents:
17617
diff
changeset
|
2793 |
"Invalid maximum code cache size: %s.\n", option->optionString); |
1 | 2794 |
return JNI_EINVAL; |
2795 |
} |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2796 |
if (FLAG_SET_CMDLINE(uintx, ReservedCodeCacheSize, (uintx)long_ReservedCodeCacheSize) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2797 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2798 |
} |
26919
361b4b4c92c0
8059468: Fix PrintCodeCache output changed by JDK-8059137
thartmann
parents:
26852
diff
changeset
|
2799 |
// -XX:NonNMethodCodeHeapSize= |
361b4b4c92c0
8059468: Fix PrintCodeCache output changed by JDK-8059137
thartmann
parents:
26852
diff
changeset
|
2800 |
} else if (match_option(option, "-XX:NonNMethodCodeHeapSize=", &tail)) { |
361b4b4c92c0
8059468: Fix PrintCodeCache output changed by JDK-8059137
thartmann
parents:
26852
diff
changeset
|
2801 |
julong long_NonNMethodCodeHeapSize = 0; |
361b4b4c92c0
8059468: Fix PrintCodeCache output changed by JDK-8059137
thartmann
parents:
26852
diff
changeset
|
2802 |
|
361b4b4c92c0
8059468: Fix PrintCodeCache output changed by JDK-8059137
thartmann
parents:
26852
diff
changeset
|
2803 |
ArgsRange errcode = parse_memory_size(tail, &long_NonNMethodCodeHeapSize, 1); |
26796 | 2804 |
if (errcode != arg_in_range) { |
2805 |
jio_fprintf(defaultStream::error_stream(), |
|
26919
361b4b4c92c0
8059468: Fix PrintCodeCache output changed by JDK-8059137
thartmann
parents:
26852
diff
changeset
|
2806 |
"Invalid maximum non-nmethod code heap size: %s.\n", option->optionString); |
26796 | 2807 |
return JNI_EINVAL; |
2808 |
} |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2809 |
if (FLAG_SET_CMDLINE(uintx, NonNMethodCodeHeapSize, (uintx)long_NonNMethodCodeHeapSize) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2810 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2811 |
} |
26796 | 2812 |
// -XX:ProfiledCodeHeapSize= |
2813 |
} else if (match_option(option, "-XX:ProfiledCodeHeapSize=", &tail)) { |
|
2814 |
julong long_ProfiledCodeHeapSize = 0; |
|
2815 |
||
2816 |
ArgsRange errcode = parse_memory_size(tail, &long_ProfiledCodeHeapSize, 1); |
|
2817 |
if (errcode != arg_in_range) { |
|
2818 |
jio_fprintf(defaultStream::error_stream(), |
|
2819 |
"Invalid maximum profiled code heap size: %s.\n", option->optionString); |
|
2820 |
return JNI_EINVAL; |
|
2821 |
} |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2822 |
if (FLAG_SET_CMDLINE(uintx, ProfiledCodeHeapSize, (uintx)long_ProfiledCodeHeapSize) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2823 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2824 |
} |
26796 | 2825 |
// -XX:NonProfiledCodeHeapSizee= |
2826 |
} else if (match_option(option, "-XX:NonProfiledCodeHeapSize=", &tail)) { |
|
2827 |
julong long_NonProfiledCodeHeapSize = 0; |
|
2828 |
||
2829 |
ArgsRange errcode = parse_memory_size(tail, &long_NonProfiledCodeHeapSize, 1); |
|
2830 |
if (errcode != arg_in_range) { |
|
2831 |
jio_fprintf(defaultStream::error_stream(), |
|
2832 |
"Invalid maximum non-profiled code heap size: %s.\n", option->optionString); |
|
2833 |
return JNI_EINVAL; |
|
2834 |
} |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2835 |
if (FLAG_SET_CMDLINE(uintx, NonProfiledCodeHeapSize, (uintx)long_NonProfiledCodeHeapSize) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2836 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2837 |
} |
1 | 2838 |
// -green |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2839 |
} else if (match_option(option, "-green")) { |
1 | 2840 |
jio_fprintf(defaultStream::error_stream(), |
2841 |
"Green threads support not available\n"); |
|
2842 |
return JNI_EINVAL; |
|
2843 |
// -native |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2844 |
} else if (match_option(option, "-native")) { |
1 | 2845 |
// HotSpot always uses native threads, ignore silently for compatibility |
2846 |
// -Xrs |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2847 |
} else if (match_option(option, "-Xrs")) { |
1 | 2848 |
// Classic/EVM option, new functionality |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2849 |
if (FLAG_SET_CMDLINE(bool, ReduceSignalUsage, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2850 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2851 |
} |
47106 | 2852 |
// -Xprof |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2853 |
} else if (match_option(option, "-Xprof")) { |
47106 | 2854 |
char version[256]; |
2855 |
// Obsolete in JDK 10 |
|
2856 |
JDK_Version::jdk(10).to_string(version, sizeof(version)); |
|
2857 |
warning("Ignoring option %s; support was removed in %s", option->optionString, version); |
|
1 | 2858 |
// -Xconcurrentio |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2859 |
} else if (match_option(option, "-Xconcurrentio")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2860 |
if (FLAG_SET_CMDLINE(bool, UseLWPSynchronization, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2861 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2862 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2863 |
if (FLAG_SET_CMDLINE(bool, BackgroundCompilation, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2864 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2865 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2866 |
if (FLAG_SET_CMDLINE(intx, DeferThrSuspendLoopCount, 1) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2867 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2868 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2869 |
if (FLAG_SET_CMDLINE(bool, UseTLAB, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2870 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2871 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2872 |
if (FLAG_SET_CMDLINE(size_t, NewSizeThreadIncrease, 16 * K) != Flag::SUCCESS) { // 20Kb per thread added to new generation |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2873 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2874 |
} |
1 | 2875 |
|
2876 |
// -Xinternalversion |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2877 |
} else if (match_option(option, "-Xinternalversion")) { |
1 | 2878 |
jio_fprintf(defaultStream::output_stream(), "%s\n", |
2879 |
VM_Version::internal_vm_info_string()); |
|
2880 |
vm_exit(0); |
|
2881 |
#ifndef PRODUCT |
|
2882 |
// -Xprintflags |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2883 |
} else if (match_option(option, "-Xprintflags")) { |
11441 | 2884 |
CommandLineFlags::printFlags(tty, false); |
1 | 2885 |
vm_exit(0); |
2886 |
#endif |
|
2887 |
// -D |
|
2888 |
} else if (match_option(option, "-D", &tail)) { |
|
28175
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2889 |
const char* value; |
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2890 |
if (match_option(option, "-Djava.endorsed.dirs=", &value) && |
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2891 |
*value!= '\0' && strcmp(value, "\"\"") != 0) { |
27562 | 2892 |
// abort if -Djava.endorsed.dirs is set |
2893 |
jio_fprintf(defaultStream::output_stream(), |
|
28175
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2894 |
"-Djava.endorsed.dirs=%s is not supported. Endorsed standards and standalone APIs\n" |
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2895 |
"in modular form will be supported via the concept of upgradeable modules.\n", value); |
27562 | 2896 |
return JNI_EINVAL; |
2897 |
} |
|
28175
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2898 |
if (match_option(option, "-Djava.ext.dirs=", &value) && |
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2899 |
*value != '\0' && strcmp(value, "\"\"") != 0) { |
27562 | 2900 |
// abort if -Djava.ext.dirs is set |
2901 |
jio_fprintf(defaultStream::output_stream(), |
|
28175
e1fed6244e90
8067366: Allow java.{endorsed,ext}.dirs property be set to empty string
mchung
parents:
28034
diff
changeset
|
2902 |
"-Djava.ext.dirs=%s is not supported. Use -classpath instead.\n", value); |
27562 | 2903 |
return JNI_EINVAL; |
2904 |
} |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2905 |
// Check for module related properties. They must be set using the modules |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2906 |
// options. For example: use "--add-modules=java.sql", not |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2907 |
// "-Djdk.module.addmods=java.sql" |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2908 |
if (is_internal_module_property(option->optionString + 2)) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2909 |
needs_module_property_warning = true; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2910 |
continue; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
2911 |
} |
27562 | 2912 |
|
1 | 2913 |
if (!add_property(tail)) { |
2914 |
return JNI_ENOMEM; |
|
2915 |
} |
|
2916 |
// Out of the box management support |
|
2917 |
if (match_option(option, "-Dcom.sun.management", &tail)) { |
|
15757
c8bc1070b876
8003539: Minimal VM don't react to -Dcom.sun.management and -XX:+ManagementServer
jprovino
parents:
15483
diff
changeset
|
2918 |
#if INCLUDE_MANAGEMENT |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2919 |
if (FLAG_SET_CMDLINE(bool, ManagementServer, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2920 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2921 |
} |
43400
cc18486e399f
8173608: Separate JDK management agent from java.management module
mchung
parents:
42903
diff
changeset
|
2922 |
// management agent in module jdk.management.agent |
cc18486e399f
8173608: Separate JDK management agent from java.management module
mchung
parents:
42903
diff
changeset
|
2923 |
if (!create_numbered_property("jdk.module.addmods", "jdk.management.agent", addmods_count++)) { |
36508 | 2924 |
return JNI_ENOMEM; |
2925 |
} |
|
15757
c8bc1070b876
8003539: Minimal VM don't react to -Dcom.sun.management and -XX:+ManagementServer
jprovino
parents:
15483
diff
changeset
|
2926 |
#else |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2927 |
jio_fprintf(defaultStream::output_stream(), |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2928 |
"-Dcom.sun.management is not supported in this VM.\n"); |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
2929 |
return JNI_ERR; |
15757
c8bc1070b876
8003539: Minimal VM don't react to -Dcom.sun.management and -XX:+ManagementServer
jprovino
parents:
15483
diff
changeset
|
2930 |
#endif |
1 | 2931 |
} |
2932 |
// -Xint |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2933 |
} else if (match_option(option, "-Xint")) { |
1 | 2934 |
set_mode_flags(_int); |
2935 |
// -Xmixed |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2936 |
} else if (match_option(option, "-Xmixed")) { |
1 | 2937 |
set_mode_flags(_mixed); |
2938 |
// -Xcomp |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2939 |
} else if (match_option(option, "-Xcomp")) { |
1 | 2940 |
// for testing the compiler; turn off all flags that inhibit compilation |
2941 |
set_mode_flags(_comp); |
|
2942 |
// -Xshare:dump |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2943 |
} else if (match_option(option, "-Xshare:dump")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2944 |
if (FLAG_SET_CMDLINE(bool, DumpSharedSpaces, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2945 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2946 |
} |
1 | 2947 |
set_mode_flags(_int); // Prevent compilation, which creates objects |
2948 |
// -Xshare:on |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2949 |
} else if (match_option(option, "-Xshare:on")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2950 |
if (FLAG_SET_CMDLINE(bool, UseSharedSpaces, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2951 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2952 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2953 |
if (FLAG_SET_CMDLINE(bool, RequireSharedSpaces, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2954 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2955 |
} |
1 | 2956 |
// -Xshare:auto |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2957 |
} else if (match_option(option, "-Xshare:auto")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2958 |
if (FLAG_SET_CMDLINE(bool, UseSharedSpaces, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2959 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2960 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2961 |
if (FLAG_SET_CMDLINE(bool, RequireSharedSpaces, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2962 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2963 |
} |
1 | 2964 |
// -Xshare:off |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2965 |
} else if (match_option(option, "-Xshare:off")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2966 |
if (FLAG_SET_CMDLINE(bool, UseSharedSpaces, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2967 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2968 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2969 |
if (FLAG_SET_CMDLINE(bool, RequireSharedSpaces, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2970 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2971 |
} |
1 | 2972 |
// -Xverify |
2973 |
} else if (match_option(option, "-Xverify", &tail)) { |
|
2974 |
if (strcmp(tail, ":all") == 0 || strcmp(tail, "") == 0) { |
|
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2975 |
if (FLAG_SET_CMDLINE(bool, BytecodeVerificationLocal, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2976 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2977 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2978 |
if (FLAG_SET_CMDLINE(bool, BytecodeVerificationRemote, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2979 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2980 |
} |
1 | 2981 |
} else if (strcmp(tail, ":remote") == 0) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2982 |
if (FLAG_SET_CMDLINE(bool, BytecodeVerificationLocal, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2983 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2984 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2985 |
if (FLAG_SET_CMDLINE(bool, BytecodeVerificationRemote, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2986 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2987 |
} |
1 | 2988 |
} else if (strcmp(tail, ":none") == 0) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2989 |
if (FLAG_SET_CMDLINE(bool, BytecodeVerificationLocal, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2990 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2991 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2992 |
if (FLAG_SET_CMDLINE(bool, BytecodeVerificationRemote, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2993 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
2994 |
} |
1 | 2995 |
} else if (is_bad_option(option, args->ignoreUnrecognized, "verification")) { |
2996 |
return JNI_EINVAL; |
|
2997 |
} |
|
2998 |
// -Xdebug |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
2999 |
} else if (match_option(option, "-Xdebug")) { |
1 | 3000 |
// note this flag has been used, then ignore |
3001 |
set_xdebug_mode(true); |
|
3002 |
// -Xnoagent |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3003 |
} else if (match_option(option, "-Xnoagent")) { |
1 | 3004 |
// For compatibility with classic. HotSpot refuses to load the old style agent.dll. |
35872
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3005 |
} else if (match_option(option, "-Xloggc:", &tail)) { |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3006 |
// Deprecated flag to redirect GC output to a file. -Xloggc:<filename> |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3007 |
log_warning(gc)("-Xloggc is deprecated. Will use -Xlog:gc:%s instead.", tail); |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3008 |
_gc_log_filename = os::strdup_check_oom(tail); |
33097 | 3009 |
} else if (match_option(option, "-Xlog", &tail)) { |
3010 |
bool ret = false; |
|
3011 |
if (strcmp(tail, ":help") == 0) { |
|
3012 |
LogConfiguration::print_command_line_help(defaultStream::output_stream()); |
|
3013 |
vm_exit(0); |
|
3014 |
} else if (strcmp(tail, ":disable") == 0) { |
|
3015 |
LogConfiguration::disable_logging(); |
|
3016 |
ret = true; |
|
3017 |
} else if (*tail == '\0') { |
|
3018 |
ret = LogConfiguration::parse_command_line_arguments(); |
|
3019 |
assert(ret, "-Xlog without arguments should never fail to parse"); |
|
3020 |
} else if (*tail == ':') { |
|
3021 |
ret = LogConfiguration::parse_command_line_arguments(tail + 1); |
|
3022 |
} |
|
3023 |
if (ret == false) { |
|
3024 |
jio_fprintf(defaultStream::error_stream(), |
|
3025 |
"Invalid -Xlog option '-Xlog%s'\n", |
|
3026 |
tail); |
|
3027 |
return JNI_EINVAL; |
|
3028 |
} |
|
1 | 3029 |
// JNI hooks |
3030 |
} else if (match_option(option, "-Xcheck", &tail)) { |
|
3031 |
if (!strcmp(tail, ":jni")) { |
|
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
3032 |
#if !INCLUDE_JNI_CHECK |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
3033 |
warning("JNI CHECKING is not supported in this VM"); |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
3034 |
#else |
1 | 3035 |
CheckJNICalls = true; |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
3036 |
#endif // INCLUDE_JNI_CHECK |
1 | 3037 |
} else if (is_bad_option(option, args->ignoreUnrecognized, |
3038 |
"check")) { |
|
3039 |
return JNI_EINVAL; |
|
3040 |
} |
|
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3041 |
} else if (match_option(option, "vfprintf")) { |
1 | 3042 |
_vfprintf_hook = CAST_TO_FN_PTR(vfprintf_hook_t, option->extraInfo); |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3043 |
} else if (match_option(option, "exit")) { |
1 | 3044 |
_exit_hook = CAST_TO_FN_PTR(exit_hook_t, option->extraInfo); |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3045 |
} else if (match_option(option, "abort")) { |
1 | 3046 |
_abort_hook = CAST_TO_FN_PTR(abort_hook_t, option->extraInfo); |
23506
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3047 |
// Need to keep consistency of MaxTenuringThreshold and AlwaysTenure/NeverTenure; |
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3048 |
// and the last option wins. |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3049 |
} else if (match_option(option, "-XX:+NeverTenure")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3050 |
if (FLAG_SET_CMDLINE(bool, NeverTenure, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3051 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3052 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3053 |
if (FLAG_SET_CMDLINE(bool, AlwaysTenure, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3054 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3055 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3056 |
if (FLAG_SET_CMDLINE(uintx, MaxTenuringThreshold, markOopDesc::max_age + 1) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3057 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3058 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3059 |
} else if (match_option(option, "-XX:+AlwaysTenure")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3060 |
if (FLAG_SET_CMDLINE(bool, NeverTenure, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3061 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3062 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3063 |
if (FLAG_SET_CMDLINE(bool, AlwaysTenure, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3064 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3065 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3066 |
if (FLAG_SET_CMDLINE(uintx, MaxTenuringThreshold, 0) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3067 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3068 |
} |
23506
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3069 |
} else if (match_option(option, "-XX:MaxTenuringThreshold=", &tail)) { |
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3070 |
uintx max_tenuring_thresh = 0; |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3071 |
if (!parse_uintx(tail, &max_tenuring_thresh, 0)) { |
23506
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3072 |
jio_fprintf(defaultStream::error_stream(), |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3073 |
"Improperly specified VM option \'MaxTenuringThreshold=%s\'\n", tail); |
30169
736fe315ddcb
8076311: Java 9 process negative MaxTenuringThreshold in different way than Java 8
ddmitriev
parents:
30130
diff
changeset
|
3074 |
return JNI_EINVAL; |
23506
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3075 |
} |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3076 |
|
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3077 |
if (FLAG_SET_CMDLINE(uintx, MaxTenuringThreshold, max_tenuring_thresh) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3078 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3079 |
} |
23506
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3080 |
|
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3081 |
if (MaxTenuringThreshold == 0) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3082 |
if (FLAG_SET_CMDLINE(bool, NeverTenure, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3083 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3084 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3085 |
if (FLAG_SET_CMDLINE(bool, AlwaysTenure, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3086 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3087 |
} |
23506
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3088 |
} else { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3089 |
if (FLAG_SET_CMDLINE(bool, NeverTenure, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3090 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3091 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3092 |
if (FLAG_SET_CMDLINE(bool, AlwaysTenure, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3093 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3094 |
} |
23506
9b98355e9060
6521376: MaxTenuringThreshold and AlwayTenure/NeverTenure consistency
tamao
parents:
23474
diff
changeset
|
3095 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3096 |
} else if (match_option(option, "-XX:+DisplayVMOutputToStderr")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3097 |
if (FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3098 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3099 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3100 |
if (FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3101 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3102 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3103 |
} else if (match_option(option, "-XX:+DisplayVMOutputToStdout")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3104 |
if (FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3105 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3106 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3107 |
if (FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3108 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3109 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3110 |
} else if (match_option(option, "-XX:+ExtendedDTraceProbes")) { |
10739 | 3111 |
#if defined(DTRACE_ENABLED) |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3112 |
if (FLAG_SET_CMDLINE(bool, ExtendedDTraceProbes, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3113 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3114 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3115 |
if (FLAG_SET_CMDLINE(bool, DTraceMethodProbes, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3116 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3117 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3118 |
if (FLAG_SET_CMDLINE(bool, DTraceAllocProbes, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3119 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3120 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3121 |
if (FLAG_SET_CMDLINE(bool, DTraceMonitorProbes, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3122 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3123 |
} |
10739 | 3124 |
#else // defined(DTRACE_ENABLED) |
1 | 3125 |
jio_fprintf(defaultStream::error_stream(), |
10739 | 3126 |
"ExtendedDTraceProbes flag is not applicable for this configuration\n"); |
1 | 3127 |
return JNI_EINVAL; |
10739 | 3128 |
#endif // defined(DTRACE_ENABLED) |
1 | 3129 |
#ifdef ASSERT |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3130 |
} else if (match_option(option, "-XX:+FullGCALot")) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3131 |
if (FLAG_SET_CMDLINE(bool, FullGCALot, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3132 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3133 |
} |
1 | 3134 |
// disable scavenge before parallel mark-compact |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3135 |
if (FLAG_SET_CMDLINE(bool, ScavengeBeforeFullGC, false) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3136 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3137 |
} |
1 | 3138 |
#endif |
15757
c8bc1070b876
8003539: Minimal VM don't react to -Dcom.sun.management and -XX:+ManagementServer
jprovino
parents:
15483
diff
changeset
|
3139 |
#if !INCLUDE_MANAGEMENT |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3140 |
} else if (match_option(option, "-XX:+ManagementServer")) { |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
3141 |
jio_fprintf(defaultStream::error_stream(), |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
3142 |
"ManagementServer is not supported in this VM.\n"); |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
3143 |
return JNI_ERR; |
15757
c8bc1070b876
8003539: Minimal VM don't react to -Dcom.sun.management and -XX:+ManagementServer
jprovino
parents:
15483
diff
changeset
|
3144 |
#endif // INCLUDE_MANAGEMENT |
4574
b2d5b0975515
6631166: CMS: better heuristics when combatting fragmentation
ysr
parents:
4444
diff
changeset
|
3145 |
} else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3146 |
// Skip -XX:Flags= and -XX:VMOptionsFile= since those cases have |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3147 |
// already been handled |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3148 |
if ((strncmp(tail, "Flags=", strlen("Flags=")) != 0) && |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3149 |
(strncmp(tail, "VMOptionsFile=", strlen("VMOptionsFile=")) != 0)) { |
1 | 3150 |
if (!process_argument(tail, args->ignoreUnrecognized, origin)) { |
3151 |
return JNI_EINVAL; |
|
3152 |
} |
|
3153 |
} |
|
3154 |
// Unknown option |
|
3155 |
} else if (is_bad_option(option, args->ignoreUnrecognized)) { |
|
3156 |
return JNI_ERR; |
|
3157 |
} |
|
3158 |
} |
|
9990
c8683968c01b
6941923: RFE: Handling large log files produced by long running Java Applications
minqi
parents:
9450
diff
changeset
|
3159 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3160 |
// PrintSharedArchiveAndExit will turn on |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3161 |
// -Xshare:on |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
3162 |
// -Xlog:class+path=info |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3163 |
if (PrintSharedArchiveAndExit) { |
31371
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3164 |
if (FLAG_SET_CMDLINE(bool, UseSharedSpaces, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3165 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3166 |
} |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3167 |
if (FLAG_SET_CMDLINE(bool, RequireSharedSpaces, true) != Flag::SUCCESS) { |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3168 |
return JNI_EINVAL; |
311143309e73
8122937: [JEP 245] Validate JVM Command-Line Flag Arguments.
gziemski
parents:
31330
diff
changeset
|
3169 |
} |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38144
diff
changeset
|
3170 |
LogConfiguration::configure_stdout(LogLevel::Info, true, LOG_TAGS(class, path)); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3171 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3172 |
|
1602
6859fd21ba2b
6554406: Change switch UseVMInterruptibleIO default to false (sol)
xlu
parents:
1500
diff
changeset
|
3173 |
// Change the default value for flags which have different default values |
6859fd21ba2b
6554406: Change switch UseVMInterruptibleIO default to false (sol)
xlu
parents:
1500
diff
changeset
|
3174 |
// when working with older JDKs. |
6174
24cec171092f
6888526: Linux getCurrentThreadCpuTime is drastically slower than Windows
aph
parents:
5908
diff
changeset
|
3175 |
#ifdef LINUX |
24cec171092f
6888526: Linux getCurrentThreadCpuTime is drastically slower than Windows
aph
parents:
5908
diff
changeset
|
3176 |
if (JDK_Version::current().compare_major(6) <= 0 && |
24cec171092f
6888526: Linux getCurrentThreadCpuTime is drastically slower than Windows
aph
parents:
5908
diff
changeset
|
3177 |
FLAG_IS_DEFAULT(UseLinuxPosixThreadCPUClocks)) { |
24cec171092f
6888526: Linux getCurrentThreadCpuTime is drastically slower than Windows
aph
parents:
5908
diff
changeset
|
3178 |
FLAG_SET_DEFAULT(UseLinuxPosixThreadCPUClocks, false); |
24cec171092f
6888526: Linux getCurrentThreadCpuTime is drastically slower than Windows
aph
parents:
5908
diff
changeset
|
3179 |
} |
24cec171092f
6888526: Linux getCurrentThreadCpuTime is drastically slower than Windows
aph
parents:
5908
diff
changeset
|
3180 |
#endif // LINUX |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3181 |
fix_appclasspath(); |
1 | 3182 |
return JNI_OK; |
3183 |
} |
|
3184 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3185 |
void Arguments::add_patch_mod_prefix(const char* module_name, const char* path, bool* patch_mod_javabase) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3186 |
// For java.base check for duplicate --patch-module options being specified on the command line. |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3187 |
// This check is only required for java.base, all other duplicate module specifications |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3188 |
// will be checked during module system initialization. The module system initialization |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3189 |
// will throw an ExceptionInInitializerError if this situation occurs. |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42620
diff
changeset
|
3190 |
if (strcmp(module_name, JAVA_BASE_NAME) == 0) { |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3191 |
if (*patch_mod_javabase) { |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42620
diff
changeset
|
3192 |
vm_exit_during_initialization("Cannot specify " JAVA_BASE_NAME " more than once to --patch-module"); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3193 |
} else { |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3194 |
*patch_mod_javabase = true; |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3195 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3196 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3197 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3198 |
// Create GrowableArray lazily, only if --patch-module has been specified |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3199 |
if (_patch_mod_prefix == NULL) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3200 |
_patch_mod_prefix = new (ResourceObj::C_HEAP, mtArguments) GrowableArray<ModulePatchPath*>(10, true); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3201 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3202 |
|
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
3203 |
_patch_mod_prefix->push(new ModulePatchPath(module_name, path)); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3204 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3205 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3206 |
// Remove all empty paths from the app classpath (if IgnoreEmptyClassPaths is enabled) |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3207 |
// |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3208 |
// This is necessary because some apps like to specify classpath like -cp foo.jar:${XYZ}:bar.jar |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3209 |
// in their start-up scripts. If XYZ is empty, the classpath will look like "-cp foo.jar::bar.jar". |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3210 |
// Java treats such empty paths as if the user specified "-cp foo.jar:.:bar.jar". I.e., an empty |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3211 |
// path is treated as the current directory. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3212 |
// |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3213 |
// This causes problems with CDS, which requires that all directories specified in the classpath |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3214 |
// must be empty. In most cases, applications do NOT want to load classes from the current |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3215 |
// directory anyway. Adding -XX:+IgnoreEmptyClassPaths will make these applications' start-up |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3216 |
// scripts compatible with CDS. |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3217 |
void Arguments::fix_appclasspath() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3218 |
if (IgnoreEmptyClassPaths) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3219 |
const char separator = *os::path_separator(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3220 |
const char* src = _java_class_path->value(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3221 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3222 |
// skip over all the leading empty paths |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3223 |
while (*src == separator) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3224 |
src ++; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3225 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3226 |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3227 |
char* copy = os::strdup_check_oom(src, mtArguments); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3228 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3229 |
// trim all trailing empty paths |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3230 |
for (char* tail = copy + strlen(copy) - 1; tail >= copy && *tail == separator; tail--) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3231 |
*tail = '\0'; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3232 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3233 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3234 |
char from[3] = {separator, separator, '\0'}; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3235 |
char to [2] = {separator, '\0'}; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3236 |
while (StringUtils::replace_no_expand(copy, from, to) > 0) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3237 |
// Keep replacing "::" -> ":" until we have no more "::" (non-windows) |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3238 |
// Keep replacing ";;" -> ";" until we have no more ";;" (windows) |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3239 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3240 |
|
36508 | 3241 |
_java_class_path->set_writeable_value(copy); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3242 |
FreeHeap(copy); // a copy was made by set_value, so don't need this anymore |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3243 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3244 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3245 |
|
27562 | 3246 |
static bool has_jar_files(const char* directory) { |
3247 |
DIR* dir = os::opendir(directory); |
|
3248 |
if (dir == NULL) return false; |
|
3249 |
||
3250 |
struct dirent *entry; |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3251 |
char *dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(directory), mtArguments); |
27562 | 3252 |
bool hasJarFile = false; |
3253 |
while (!hasJarFile && (entry = os::readdir(dir, (dirent *) dbuf)) != NULL) { |
|
3254 |
const char* name = entry->d_name; |
|
3255 |
const char* ext = name + strlen(name) - 4; |
|
3256 |
hasJarFile = ext > name && (os::file_name_strcmp(ext, ".jar") == 0); |
|
3257 |
} |
|
27926 | 3258 |
FREE_C_HEAP_ARRAY(char, dbuf); |
27562 | 3259 |
os::closedir(dir); |
3260 |
return hasJarFile ; |
|
3261 |
} |
|
3262 |
||
3263 |
static int check_non_empty_dirs(const char* path) { |
|
3264 |
const char separator = *os::path_separator(); |
|
3265 |
const char* const end = path + strlen(path); |
|
3266 |
int nonEmptyDirs = 0; |
|
3267 |
while (path < end) { |
|
3268 |
const char* tmp_end = strchr(path, separator); |
|
3269 |
if (tmp_end == NULL) { |
|
3270 |
if (has_jar_files(path)) { |
|
3271 |
nonEmptyDirs++; |
|
3272 |
jio_fprintf(defaultStream::output_stream(), |
|
3273 |
"Non-empty directory: %s\n", path); |
|
3274 |
} |
|
3275 |
path = end; |
|
3276 |
} else { |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3277 |
char* dirpath = NEW_C_HEAP_ARRAY(char, tmp_end - path + 1, mtArguments); |
27562 | 3278 |
memcpy(dirpath, path, tmp_end - path); |
3279 |
dirpath[tmp_end - path] = '\0'; |
|
3280 |
if (has_jar_files(dirpath)) { |
|
3281 |
nonEmptyDirs++; |
|
3282 |
jio_fprintf(defaultStream::output_stream(), |
|
3283 |
"Non-empty directory: %s\n", dirpath); |
|
3284 |
} |
|
27926 | 3285 |
FREE_C_HEAP_ARRAY(char, dirpath); |
27562 | 3286 |
path = tmp_end + 1; |
3287 |
} |
|
3288 |
} |
|
3289 |
return nonEmptyDirs; |
|
3290 |
} |
|
3291 |
||
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3292 |
jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) { |
27562 | 3293 |
// check if the default lib/endorsed directory exists; if so, error |
3294 |
char path[JVM_MAXPATHLEN]; |
|
3295 |
const char* fileSep = os::file_separator(); |
|
41540 | 3296 |
jio_snprintf(path, JVM_MAXPATHLEN, "%s%slib%sendorsed", Arguments::get_java_home(), fileSep, fileSep); |
27562 | 3297 |
|
3298 |
if (CheckEndorsedAndExtDirs) { |
|
3299 |
int nonEmptyDirs = 0; |
|
3300 |
// check endorsed directory |
|
3301 |
nonEmptyDirs += check_non_empty_dirs(path); |
|
3302 |
// check the extension directories |
|
3303 |
nonEmptyDirs += check_non_empty_dirs(Arguments::get_ext_dirs()); |
|
3304 |
if (nonEmptyDirs > 0) { |
|
3305 |
return JNI_ERR; |
|
3306 |
} |
|
3307 |
} |
|
3308 |
||
3309 |
DIR* dir = os::opendir(path); |
|
3310 |
if (dir != NULL) { |
|
3311 |
jio_fprintf(defaultStream::output_stream(), |
|
3312 |
"<JAVA_HOME>/lib/endorsed is not supported. Endorsed standards and standalone APIs\n" |
|
3313 |
"in modular form will be supported via the concept of upgradeable modules.\n"); |
|
3314 |
os::closedir(dir); |
|
3315 |
return JNI_ERR; |
|
3316 |
} |
|
3317 |
||
41540 | 3318 |
jio_snprintf(path, JVM_MAXPATHLEN, "%s%slib%sext", Arguments::get_java_home(), fileSep, fileSep); |
27562 | 3319 |
dir = os::opendir(path); |
3320 |
if (dir != NULL) { |
|
3321 |
jio_fprintf(defaultStream::output_stream(), |
|
3322 |
"<JAVA_HOME>/lib/ext exists, extensions mechanism no longer supported; " |
|
3323 |
"Use -classpath instead.\n."); |
|
3324 |
os::closedir(dir); |
|
3325 |
return JNI_ERR; |
|
3326 |
} |
|
3327 |
||
47903
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3328 |
// This must be done after all arguments have been processed |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3329 |
// and the container support has been initialized since AggressiveHeap |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3330 |
// relies on the amount of total memory available. |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3331 |
if (AggressiveHeap) { |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3332 |
jint result = set_aggressive_heap_flags(); |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3333 |
if (result != JNI_OK) { |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3334 |
return result; |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3335 |
} |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3336 |
} |
7f22774a5f42
8146115: Improve docker container detection and resource configuration usage
bobv
parents:
47883
diff
changeset
|
3337 |
|
1 | 3338 |
// This must be done after all arguments have been processed. |
3339 |
// java_compiler() true means set to "NONE" or empty. |
|
3340 |
if (java_compiler() && !xdebug_mode()) { |
|
3341 |
// For backwards compatibility, we switch to interpreted mode if |
|
3342 |
// -Djava.compiler="NONE" or "" is specified AND "-Xdebug" was |
|
3343 |
// not specified. |
|
3344 |
set_mode_flags(_int); |
|
3345 |
} |
|
27148
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
3346 |
|
28726
e69d7f50ef94
8071312: compiler/arguments/CheckCompileThresholdScaling.java fails
zmajo
parents:
28650
diff
changeset
|
3347 |
// CompileThresholdScaling == 0.0 is same as -Xint: Disable compilation (enable interpreter-only mode), |
e69d7f50ef94
8071312: compiler/arguments/CheckCompileThresholdScaling.java fails
zmajo
parents:
28650
diff
changeset
|
3348 |
// but like -Xint, leave compilation thresholds unaffected. |
e69d7f50ef94
8071312: compiler/arguments/CheckCompileThresholdScaling.java fails
zmajo
parents:
28650
diff
changeset
|
3349 |
// With tiered compilation disabled, setting CompileThreshold to 0 disables compilation as well. |
e69d7f50ef94
8071312: compiler/arguments/CheckCompileThresholdScaling.java fails
zmajo
parents:
28650
diff
changeset
|
3350 |
if ((CompileThresholdScaling == 0.0) || (!TieredCompilation && CompileThreshold == 0)) { |
1 | 3351 |
set_mode_flags(_int); |
3352 |
} |
|
3353 |
||
17397
609242d28659
8014765: VM exits if MaxTenuringThreshold is set below the default InitialTenuringThreshold, and InitialTenuringThreshold is not set
tschatzl
parents:
17392
diff
changeset
|
3354 |
// eventually fix up InitialTenuringThreshold if only MaxTenuringThreshold is set |
609242d28659
8014765: VM exits if MaxTenuringThreshold is set below the default InitialTenuringThreshold, and InitialTenuringThreshold is not set
tschatzl
parents:
17392
diff
changeset
|
3355 |
if (FLAG_IS_DEFAULT(InitialTenuringThreshold) && (InitialTenuringThreshold > MaxTenuringThreshold)) { |
609242d28659
8014765: VM exits if MaxTenuringThreshold is set below the default InitialTenuringThreshold, and InitialTenuringThreshold is not set
tschatzl
parents:
17392
diff
changeset
|
3356 |
FLAG_SET_ERGO(uintx, InitialTenuringThreshold, MaxTenuringThreshold); |
609242d28659
8014765: VM exits if MaxTenuringThreshold is set below the default InitialTenuringThreshold, and InitialTenuringThreshold is not set
tschatzl
parents:
17392
diff
changeset
|
3357 |
} |
609242d28659
8014765: VM exits if MaxTenuringThreshold is set below the default InitialTenuringThreshold, and InitialTenuringThreshold is not set
tschatzl
parents:
17392
diff
changeset
|
3358 |
|
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
3359 |
#if !defined(COMPILER2) && !INCLUDE_JVMCI |
1 | 3360 |
// Don't degrade server performance for footprint |
3361 |
if (FLAG_IS_DEFAULT(UseLargePages) && |
|
3362 |
MaxHeapSize < LargePageHeapSizeThreshold) { |
|
3363 |
// No need for large granularity pages w/small heaps. |
|
3364 |
// Note that large pages are enabled/disabled for both the |
|
3365 |
// Java heap and the code cache. |
|
3366 |
FLAG_SET_DEFAULT(UseLargePages, false); |
|
3367 |
} |
|
1374
4c24294029a9
6711316: Open source the Garbage-First garbage collector
ysr
parents:
382
diff
changeset
|
3368 |
|
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
3369 |
#elif defined(COMPILER2) |
1 | 3370 |
if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) { |
3371 |
FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1); |
|
3372 |
} |
|
3373 |
#endif |
|
3374 |
||
37272
c427db4ea8c4
8148639: Some MethodCounter fields can be excluded when not including C2
cjplummer
parents:
36812
diff
changeset
|
3375 |
#if !defined(COMPILER2) && !INCLUDE_JVMCI |
37296 | 3376 |
UNSUPPORTED_OPTION(ProfileInterpreter); |
3377 |
NOT_PRODUCT(UNSUPPORTED_OPTION(TraceProfileInterpreter)); |
|
37272
c427db4ea8c4
8148639: Some MethodCounter fields can be excluded when not including C2
cjplummer
parents:
36812
diff
changeset
|
3378 |
#endif |
c427db4ea8c4
8148639: Some MethodCounter fields can be excluded when not including C2
cjplummer
parents:
36812
diff
changeset
|
3379 |
|
19155
706406e1c98e
8021120: TieredCompilation can be enabled even if TIERED is undefined
iignatyev
parents:
18946
diff
changeset
|
3380 |
#ifndef TIERED |
706406e1c98e
8021120: TieredCompilation can be enabled even if TIERED is undefined
iignatyev
parents:
18946
diff
changeset
|
3381 |
// Tiered compilation is undefined. |
37253
45e69c7b0bac
8152929: Remove UNSUPPORTED_GC_OPTION, use UNSUPPORTED_OPTION instead
pliden
parents:
37237
diff
changeset
|
3382 |
UNSUPPORTED_OPTION(TieredCompilation); |
19155
706406e1c98e
8021120: TieredCompilation can be enabled even if TIERED is undefined
iignatyev
parents:
18946
diff
changeset
|
3383 |
#endif |
706406e1c98e
8021120: TieredCompilation can be enabled even if TIERED is undefined
iignatyev
parents:
18946
diff
changeset
|
3384 |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3385 |
#if INCLUDE_JVMCI |
41073
ed43eecbd166
8165634: Support multiple --add-modules options on the command line
hseigel
parents:
40924
diff
changeset
|
3386 |
if (EnableJVMCI && |
43972 | 3387 |
!create_numbered_property("jdk.module.addmods", "jdk.internal.vm.ci", addmods_count++)) { |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3388 |
return JNI_ENOMEM; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3389 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3390 |
#endif |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37510
diff
changeset
|
3391 |
|
6176
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3392 |
// If we are running in a headless jre, force java.awt.headless property |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3393 |
// to be true unless the property has already been set. |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3394 |
// Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state. |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3395 |
if (os::is_headless_jre()) { |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3396 |
const char* headless = Arguments::get_property("java.awt.headless"); |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3397 |
if (headless == NULL) { |
30125 | 3398 |
const char *headless_env = ::getenv("JAVA_AWT_HEADLESS"); |
3399 |
if (headless_env == NULL) { |
|
6176
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3400 |
if (!add_property("java.awt.headless=true")) { |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3401 |
return JNI_ENOMEM; |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3402 |
} |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3403 |
} else { |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3404 |
char buffer[256]; |
30281 | 3405 |
jio_snprintf(buffer, sizeof(buffer), "java.awt.headless=%s", headless_env); |
6176
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3406 |
if (!add_property(buffer)) { |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3407 |
return JNI_ENOMEM; |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3408 |
} |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3409 |
} |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3410 |
} |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3411 |
} |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
3412 |
|
27892
06a143c836ad
8065305: Make it possible to extend the G1CollectorPolicy
jwilhelm
parents:
27686
diff
changeset
|
3413 |
if (!check_vm_args_consistency()) { |
1 | 3414 |
return JNI_ERR; |
3415 |
} |
|
3416 |
||
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
3417 |
#if INCLUDE_JVMCI |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
3418 |
if (UseJVMCICompiler) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
3419 |
Compilation_mode = CompMode_server; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
3420 |
} |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
3421 |
#endif |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
3422 |
|
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3423 |
#if INCLUDE_CDS |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3424 |
if (DumpSharedSpaces) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3425 |
// Disable biased locking now as it interferes with the clean up of |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3426 |
// the archived Klasses and Java string objects (at dump time only). |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3427 |
UseBiasedLocking = false; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3428 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3429 |
if (UseSharedSpaces && patch_mod_javabase) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3430 |
no_shared_spaces("CDS is disabled when " JAVA_BASE_NAME " module is patched."); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3431 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3432 |
#endif |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
46815
diff
changeset
|
3433 |
|
1 | 3434 |
return JNI_OK; |
3435 |
} |
|
3436 |
||
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3437 |
// Helper class for controlling the lifetime of JavaVMInitArgs |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3438 |
// objects. The contents of the JavaVMInitArgs are guaranteed to be |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3439 |
// deleted on the destruction of the ScopedVMInitArgs object. |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3440 |
class ScopedVMInitArgs : public StackObj { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3441 |
private: |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3442 |
JavaVMInitArgs _args; |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3443 |
char* _container_name; |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3444 |
bool _is_set; |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3445 |
char* _vm_options_file_arg; |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3446 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3447 |
public: |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3448 |
ScopedVMInitArgs(const char *container_name) { |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3449 |
_args.version = JNI_VERSION_1_2; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3450 |
_args.nOptions = 0; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3451 |
_args.options = NULL; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3452 |
_args.ignoreUnrecognized = false; |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3453 |
_container_name = (char *)container_name; |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3454 |
_is_set = false; |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3455 |
_vm_options_file_arg = NULL; |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3456 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3457 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3458 |
// Populates the JavaVMInitArgs object represented by this |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3459 |
// ScopedVMInitArgs object with the arguments in options. The |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3460 |
// allocated memory is deleted by the destructor. If this method |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3461 |
// returns anything other than JNI_OK, then this object is in a |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3462 |
// partially constructed state, and should be abandoned. |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3463 |
jint set_args(GrowableArray<JavaVMOption>* options) { |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3464 |
_is_set = true; |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3465 |
JavaVMOption* options_arr = NEW_C_HEAP_ARRAY_RETURN_NULL( |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3466 |
JavaVMOption, options->length(), mtArguments); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3467 |
if (options_arr == NULL) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3468 |
return JNI_ENOMEM; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3469 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3470 |
_args.options = options_arr; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3471 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3472 |
for (int i = 0; i < options->length(); i++) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3473 |
options_arr[i] = options->at(i); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3474 |
options_arr[i].optionString = os::strdup(options_arr[i].optionString); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3475 |
if (options_arr[i].optionString == NULL) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3476 |
// Rely on the destructor to do cleanup. |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3477 |
_args.nOptions = i; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3478 |
return JNI_ENOMEM; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3479 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3480 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3481 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3482 |
_args.nOptions = options->length(); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3483 |
_args.ignoreUnrecognized = IgnoreUnrecognizedVMOptions; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3484 |
return JNI_OK; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3485 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3486 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3487 |
JavaVMInitArgs* get() { return &_args; } |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3488 |
char* container_name() { return _container_name; } |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3489 |
bool is_set() { return _is_set; } |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3490 |
bool found_vm_options_file_arg() { return _vm_options_file_arg != NULL; } |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3491 |
char* vm_options_file_arg() { return _vm_options_file_arg; } |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3492 |
|
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3493 |
void set_vm_options_file_arg(const char *vm_options_file_arg) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3494 |
if (_vm_options_file_arg != NULL) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3495 |
os::free(_vm_options_file_arg); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3496 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3497 |
_vm_options_file_arg = os::strdup_check_oom(vm_options_file_arg); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3498 |
} |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3499 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3500 |
~ScopedVMInitArgs() { |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3501 |
if (_vm_options_file_arg != NULL) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3502 |
os::free(_vm_options_file_arg); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3503 |
} |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3504 |
if (_args.options == NULL) return; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3505 |
for (int i = 0; i < _args.nOptions; i++) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3506 |
os::free(_args.options[i].optionString); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3507 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3508 |
FREE_C_HEAP_ARRAY(JavaVMOption, _args.options); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3509 |
} |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3510 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3511 |
// Insert options into this option list, to replace option at |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3512 |
// vm_options_file_pos (-XX:VMOptionsFile) |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3513 |
jint insert(const JavaVMInitArgs* args, |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3514 |
const JavaVMInitArgs* args_to_insert, |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3515 |
const int vm_options_file_pos) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3516 |
assert(_args.options == NULL, "shouldn't be set yet"); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3517 |
assert(args_to_insert->nOptions != 0, "there should be args to insert"); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3518 |
assert(vm_options_file_pos != -1, "vm_options_file_pos should be set"); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3519 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3520 |
int length = args->nOptions + args_to_insert->nOptions - 1; |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3521 |
GrowableArray<JavaVMOption> *options = new (ResourceObj::C_HEAP, mtArguments) |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3522 |
GrowableArray<JavaVMOption>(length, true); // Construct new option array |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3523 |
for (int i = 0; i < args->nOptions; i++) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3524 |
if (i == vm_options_file_pos) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3525 |
// insert the new options starting at the same place as the |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3526 |
// -XX:VMOptionsFile option |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3527 |
for (int j = 0; j < args_to_insert->nOptions; j++) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3528 |
options->push(args_to_insert->options[j]); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3529 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3530 |
} else { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3531 |
options->push(args->options[i]); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3532 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3533 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3534 |
// make into options array |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3535 |
jint result = set_args(options); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3536 |
delete options; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3537 |
return result; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3538 |
} |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3539 |
}; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3540 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3541 |
jint Arguments::parse_java_options_environment_variable(ScopedVMInitArgs* args) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3542 |
return parse_options_environment_variable("_JAVA_OPTIONS", args); |
1 | 3543 |
} |
3544 |
||
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3545 |
jint Arguments::parse_java_tool_options_environment_variable(ScopedVMInitArgs* args) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3546 |
return parse_options_environment_variable("JAVA_TOOL_OPTIONS", args); |
1 | 3547 |
} |
3548 |
||
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3549 |
jint Arguments::parse_options_environment_variable(const char* name, |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3550 |
ScopedVMInitArgs* vm_args) { |
30125 | 3551 |
char *buffer = ::getenv(name); |
3552 |
||
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3553 |
// Don't check this environment variable if user has special privileges |
1 | 3554 |
// (e.g. unix su command). |
30125 | 3555 |
if (buffer == NULL || os::have_special_privileges()) { |
3556 |
return JNI_OK; |
|
3557 |
} |
|
3558 |
||
3559 |
if ((buffer = os::strdup(buffer)) == NULL) { |
|
3560 |
return JNI_ENOMEM; |
|
3561 |
} |
|
3562 |
||
43469
2048c42e2c88
8173081: VM no longer prints "Picked up _JAVA_OPTONS: " message
dcubed
parents:
43455
diff
changeset
|
3563 |
jio_fprintf(defaultStream::error_stream(), |
2048c42e2c88
8173081: VM no longer prints "Picked up _JAVA_OPTONS: " message
dcubed
parents:
43455
diff
changeset
|
3564 |
"Picked up %s: %s\n", name, buffer); |
2048c42e2c88
8173081: VM no longer prints "Picked up _JAVA_OPTONS: " message
dcubed
parents:
43455
diff
changeset
|
3565 |
|
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3566 |
int retcode = parse_options_buffer(name, buffer, strlen(buffer), vm_args); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3567 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3568 |
os::free(buffer); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3569 |
return retcode; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3570 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3571 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3572 |
jint Arguments::parse_vm_options_file(const char* file_name, ScopedVMInitArgs* vm_args) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3573 |
// read file into buffer |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3574 |
int fd = ::open(file_name, O_RDONLY); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3575 |
if (fd < 0) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3576 |
jio_fprintf(defaultStream::error_stream(), |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3577 |
"Could not open options file '%s'\n", |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3578 |
file_name); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3579 |
return JNI_ERR; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3580 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3581 |
|
33113
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3582 |
struct stat stbuf; |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3583 |
int retcode = os::stat(file_name, &stbuf); |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3584 |
if (retcode != 0) { |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3585 |
jio_fprintf(defaultStream::error_stream(), |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3586 |
"Could not stat options file '%s'\n", |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3587 |
file_name); |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3588 |
os::close(fd); |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3589 |
return JNI_ERR; |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3590 |
} |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3591 |
|
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3592 |
if (stbuf.st_size == 0) { |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3593 |
// tell caller there is no option data and that is ok |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3594 |
os::close(fd); |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3595 |
return JNI_OK; |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3596 |
} |
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3597 |
|
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3598 |
// '+ 1' for NULL termination even with max bytes |
33113
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3599 |
size_t bytes_alloc = stbuf.st_size + 1; |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3600 |
|
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3601 |
char *buf = NEW_C_HEAP_ARRAY_RETURN_NULL(char, bytes_alloc, mtArguments); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3602 |
if (NULL == buf) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3603 |
jio_fprintf(defaultStream::error_stream(), |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3604 |
"Could not allocate read buffer for options file parse\n"); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3605 |
os::close(fd); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3606 |
return JNI_ENOMEM; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3607 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3608 |
|
33113
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3609 |
memset(buf, 0, bytes_alloc); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3610 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3611 |
// Fill buffer |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3612 |
// Use ::read() instead of os::read because os::read() |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3613 |
// might do a thread state transition |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3614 |
// and it is too early for that here |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3615 |
|
33113
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3616 |
ssize_t bytes_read = ::read(fd, (void *)buf, (unsigned)bytes_alloc); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3617 |
os::close(fd); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3618 |
if (bytes_read < 0) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3619 |
FREE_C_HEAP_ARRAY(char, buf); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3620 |
jio_fprintf(defaultStream::error_stream(), |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3621 |
"Could not read options file '%s'\n", file_name); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3622 |
return JNI_ERR; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3623 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3624 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3625 |
if (bytes_read == 0) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3626 |
// tell caller there is no option data and that is ok |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3627 |
FREE_C_HEAP_ARRAY(char, buf); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3628 |
return JNI_OK; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3629 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3630 |
|
33113
ca9ef69338be
8135195: VM Options file should not be limited to 1k in bytes
dcubed
parents:
33097
diff
changeset
|
3631 |
retcode = parse_options_buffer(file_name, buf, bytes_read, vm_args); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3632 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3633 |
FREE_C_HEAP_ARRAY(char, buf); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3634 |
return retcode; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3635 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3636 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3637 |
jint Arguments::parse_options_buffer(const char* name, char* buffer, const size_t buf_len, ScopedVMInitArgs* vm_args) { |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3638 |
GrowableArray<JavaVMOption> *options = new (ResourceObj::C_HEAP, mtArguments) GrowableArray<JavaVMOption>(2, true); // Construct option array |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3639 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3640 |
// some pointers to help with parsing |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3641 |
char *buffer_end = buffer + buf_len; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3642 |
char *opt_hd = buffer; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3643 |
char *wrt = buffer; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3644 |
char *rd = buffer; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3645 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3646 |
// parse all options |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3647 |
while (rd < buffer_end) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3648 |
// skip leading white space from the input string |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3649 |
while (rd < buffer_end && isspace(*rd)) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3650 |
rd++; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3651 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3652 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3653 |
if (rd >= buffer_end) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3654 |
break; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3655 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3656 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3657 |
// Remember this is where we found the head of the token. |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3658 |
opt_hd = wrt; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3659 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3660 |
// Tokens are strings of non white space characters separated |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3661 |
// by one or more white spaces. |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3662 |
while (rd < buffer_end && !isspace(*rd)) { |
30125 | 3663 |
if (*rd == '\'' || *rd == '"') { // handle a quoted string |
3664 |
int quote = *rd; // matching quote to look for |
|
3665 |
rd++; // don't copy open quote |
|
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3666 |
while (rd < buffer_end && *rd != quote) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3667 |
// include everything (even spaces) |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3668 |
// up until the close quote |
30125 | 3669 |
*wrt++ = *rd++; // copy to option string |
1 | 3670 |
} |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3671 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3672 |
if (rd < buffer_end) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3673 |
rd++; // don't copy close quote |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3674 |
} else { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3675 |
// did not see closing quote |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3676 |
jio_fprintf(defaultStream::error_stream(), |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3677 |
"Unmatched quote in %s\n", name); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3678 |
delete options; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3679 |
return JNI_ERR; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3680 |
} |
30125 | 3681 |
} else { |
3682 |
*wrt++ = *rd++; // copy to option string |
|
1 | 3683 |
} |
3684 |
} |
|
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3685 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3686 |
// steal a white space character and set it to NULL |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3687 |
*wrt++ = '\0'; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3688 |
// We now have a complete token |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3689 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3690 |
JavaVMOption option; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3691 |
option.optionString = opt_hd; |
33589
7cbd1b2c139b
8139040: Fix initializations before ShouldNotReachHere() etc. and enable -Wuninitialized on linux.
goetz
parents:
33230
diff
changeset
|
3692 |
option.extraInfo = NULL; |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3693 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3694 |
options->append(option); // Fill in option |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3695 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3696 |
rd++; // Advance to next character |
30125 | 3697 |
} |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3698 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3699 |
// Fill out JavaVMInitArgs structure. |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3700 |
jint status = vm_args->set_args(options); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3701 |
|
30130
386d3e9878bc
8076450: com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java: assert(!on_C_heap() || allocated_on_C_heap()) failed: growable array must be on C heap if elements are
sla
parents:
30125
diff
changeset
|
3702 |
delete options; |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3703 |
return status; |
1 | 3704 |
} |
3705 |
||
8681
c691d94813f9
7018056: large pages not always enabled by default
jcoomes
parents:
8476
diff
changeset
|
3706 |
void Arguments::set_shared_spaces_flags() { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13516
diff
changeset
|
3707 |
if (DumpSharedSpaces) { |
41539 | 3708 |
if (FailOverToOldVerifier) { |
3709 |
// Don't fall back to the old verifier on verification failure. If a |
|
3710 |
// class fails verification with the split verifier, it might fail the |
|
3711 |
// CDS runtime verifier constraint check. In that case, we don't want |
|
3712 |
// to share the class. We only archive classes that pass the split verifier. |
|
3713 |
FLAG_SET_DEFAULT(FailOverToOldVerifier, false); |
|
3714 |
} |
|
36508 | 3715 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13516
diff
changeset
|
3716 |
if (RequireSharedSpaces) { |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
3717 |
warning("Cannot dump shared archive while using shared archive"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13516
diff
changeset
|
3718 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13516
diff
changeset
|
3719 |
UseSharedSpaces = false; |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
3720 |
#ifdef _LP64 |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
3721 |
if (!UseCompressedOops || !UseCompressedClassPointers) { |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
3722 |
vm_exit_during_initialization( |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
3723 |
"Cannot dump shared archive when UseCompressedOops or UseCompressedClassPointers is off.", NULL); |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
3724 |
} |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
3725 |
} else { |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
3726 |
if (!UseCompressedOops || !UseCompressedClassPointers) { |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
3727 |
no_shared_spaces("UseCompressedOops and UseCompressedClassPointers must be on for UseSharedSpaces."); |
19319
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
3728 |
} |
0ad35be0733a
8003424: Enable Class Data Sharing for CompressedOops
hseigel
parents:
19159
diff
changeset
|
3729 |
#endif |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13516
diff
changeset
|
3730 |
} |
8681
c691d94813f9
7018056: large pages not always enabled by default
jcoomes
parents:
8476
diff
changeset
|
3731 |
} |
6988
282ba493439c
6996136: VM crash in src/share/vm/runtime/virtualspace.cpp:424
iveresov
parents:
6987
diff
changeset
|
3732 |
|
17375
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3733 |
// Sharing support |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3734 |
// Construct the path to the archive |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3735 |
static char* get_shared_archive_path() { |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3736 |
char *shared_archive_path; |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3737 |
if (SharedArchiveFile == NULL) { |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3738 |
char jvm_path[JVM_MAXPATHLEN]; |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3739 |
os::jvm_path(jvm_path, sizeof(jvm_path)); |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3740 |
char *end = strrchr(jvm_path, *os::file_separator()); |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3741 |
if (end != NULL) *end = '\0'; |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3742 |
size_t jvm_path_len = strlen(jvm_path); |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3743 |
size_t file_sep_len = strlen(os::file_separator()); |
30281 | 3744 |
const size_t len = jvm_path_len + file_sep_len + 20; |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3745 |
shared_archive_path = NEW_C_HEAP_ARRAY(char, len, mtArguments); |
17375
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3746 |
if (shared_archive_path != NULL) { |
30281 | 3747 |
jio_snprintf(shared_archive_path, len, "%s%sclasses.jsa", |
3748 |
jvm_path, os::file_separator()); |
|
17375
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3749 |
} |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3750 |
} else { |
37491
edf4cc53f5a3
8153039: Command line processing should use mtCommand or mtArguments rather than mtInternal for NMT
gziemski
parents:
37449
diff
changeset
|
3751 |
shared_archive_path = os::strdup_check_oom(SharedArchiveFile, mtArguments); |
17375
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3752 |
} |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3753 |
return shared_archive_path; |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3754 |
} |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
3755 |
|
20010
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3756 |
#ifndef PRODUCT |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3757 |
// Determine whether LogVMOutput should be implicitly turned on. |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3758 |
static bool use_vm_log() { |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3759 |
if (LogCompilation || !FLAG_IS_DEFAULT(LogFile) || |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3760 |
PrintCompilation || PrintInlining || PrintDependencies || PrintNativeNMethods || |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3761 |
PrintDebugInfo || PrintRelocations || PrintNMethods || PrintExceptionHandlers || |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3762 |
PrintAssembly || TraceDeoptimization || TraceDependencies || |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3763 |
(VerifyDependencies && FLAG_IS_CMDLINE(VerifyDependencies))) { |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3764 |
return true; |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3765 |
} |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3766 |
|
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3767 |
#ifdef COMPILER1 |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3768 |
if (PrintC1Statistics) { |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3769 |
return true; |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3770 |
} |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3771 |
#endif // COMPILER1 |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3772 |
|
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3773 |
#ifdef COMPILER2 |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3774 |
if (PrintOptoAssembly || PrintOptoStatistics) { |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3775 |
return true; |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3776 |
} |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3777 |
#endif // COMPILER2 |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3778 |
|
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3779 |
return false; |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3780 |
} |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3781 |
|
20010
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3782 |
#endif // PRODUCT |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
3783 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3784 |
bool Arguments::args_contains_vm_options_file_arg(const JavaVMInitArgs* args) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3785 |
for (int index = 0; index < args->nOptions; index++) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3786 |
const JavaVMOption* option = args->options + index; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3787 |
const char* tail; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3788 |
if (match_option(option, "-XX:VMOptionsFile=", &tail)) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3789 |
return true; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3790 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3791 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3792 |
return false; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3793 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3794 |
|
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3795 |
jint Arguments::insert_vm_options_file(const JavaVMInitArgs* args, |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3796 |
const char* vm_options_file, |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3797 |
const int vm_options_file_pos, |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3798 |
ScopedVMInitArgs* vm_options_file_args, |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3799 |
ScopedVMInitArgs* args_out) { |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3800 |
jint code = parse_vm_options_file(vm_options_file, vm_options_file_args); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3801 |
if (code != JNI_OK) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3802 |
return code; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3803 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3804 |
|
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3805 |
if (vm_options_file_args->get()->nOptions < 1) { |
33220
06fda2285c63
8136552: Last argument wins does not work for special options with "-XX:VMOptionsFile" option
dcubed
parents:
33144
diff
changeset
|
3806 |
return JNI_OK; |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3807 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3808 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3809 |
if (args_contains_vm_options_file_arg(vm_options_file_args->get())) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3810 |
jio_fprintf(defaultStream::error_stream(), |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3811 |
"A VM options file may not refer to a VM options file. " |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3812 |
"Specification of '-XX:VMOptionsFile=<file-name>' in the " |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3813 |
"options file '%s' in options container '%s' is an error.\n", |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3814 |
vm_options_file_args->vm_options_file_arg(), |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3815 |
vm_options_file_args->container_name()); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3816 |
return JNI_EINVAL; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3817 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3818 |
|
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3819 |
return args_out->insert(args, vm_options_file_args->get(), |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3820 |
vm_options_file_pos); |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3821 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3822 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3823 |
// Expand -XX:VMOptionsFile found in args_in as needed. |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3824 |
// mod_args and args_out parameters may return values as needed. |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3825 |
jint Arguments::expand_vm_options_as_needed(const JavaVMInitArgs* args_in, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3826 |
ScopedVMInitArgs* mod_args, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3827 |
JavaVMInitArgs** args_out) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3828 |
jint code = match_special_option_and_act(args_in, mod_args); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3829 |
if (code != JNI_OK) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3830 |
return code; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3831 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3832 |
|
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3833 |
if (mod_args->is_set()) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3834 |
// args_in contains -XX:VMOptionsFile and mod_args contains the |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3835 |
// original options from args_in along with the options expanded |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3836 |
// from the VMOptionsFile. Return a short-hand to the caller. |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3837 |
*args_out = mod_args->get(); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3838 |
} else { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3839 |
*args_out = (JavaVMInitArgs *)args_in; // no changes so use args_in |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3840 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3841 |
return JNI_OK; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3842 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3843 |
|
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3844 |
jint Arguments::match_special_option_and_act(const JavaVMInitArgs* args, |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3845 |
ScopedVMInitArgs* args_out) { |
1 | 3846 |
// Remaining part of option string |
3847 |
const char* tail; |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3848 |
ScopedVMInitArgs vm_options_file_args(args_out->container_name()); |
1 | 3849 |
|
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3850 |
for (int index = 0; index < args->nOptions; index++) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3851 |
const JavaVMOption* option = args->options + index; |
27244
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3852 |
if (ArgumentsExt::process_options(option)) { |
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3853 |
continue; |
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3854 |
} |
1 | 3855 |
if (match_option(option, "-XX:Flags=", &tail)) { |
34125
56c4a2d19ee1
8141068: refactor -XXFlags= code in preparation for removal
rdurbin
parents:
33775
diff
changeset
|
3856 |
Arguments::set_jvm_flags_file(tail); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3857 |
continue; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3858 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3859 |
if (match_option(option, "-XX:VMOptionsFile=", &tail)) { |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3860 |
if (vm_options_file_args.found_vm_options_file_arg()) { |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3861 |
jio_fprintf(defaultStream::error_stream(), |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3862 |
"The option '%s' is already specified in the options " |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3863 |
"container '%s' so the specification of '%s' in the " |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3864 |
"same options container is an error.\n", |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3865 |
vm_options_file_args.vm_options_file_arg(), |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3866 |
vm_options_file_args.container_name(), |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3867 |
option->optionString); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3868 |
return JNI_EINVAL; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
3869 |
} |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3870 |
vm_options_file_args.set_vm_options_file_arg(option->optionString); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3871 |
// If there's a VMOptionsFile, parse that |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3872 |
jint code = insert_vm_options_file(args, tail, index, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3873 |
&vm_options_file_args, args_out); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3874 |
if (code != JNI_OK) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3875 |
return code; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3876 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3877 |
args_out->set_vm_options_file_arg(vm_options_file_args.vm_options_file_arg()); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3878 |
if (args_out->is_set()) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3879 |
// The VMOptions file inserted some options so switch 'args' |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3880 |
// to the new set of options, and continue processing which |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3881 |
// preserves "last option wins" semantics. |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3882 |
args = args_out->get(); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3883 |
// The first option from the VMOptionsFile replaces the |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3884 |
// current option. So we back track to process the |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3885 |
// replacement option. |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3886 |
index--; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3887 |
} |
27244
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3888 |
continue; |
1 | 3889 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3890 |
if (match_option(option, "-XX:+PrintVMOptions")) { |
1 | 3891 |
PrintVMOptions = true; |
27244
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3892 |
continue; |
1 | 3893 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3894 |
if (match_option(option, "-XX:-PrintVMOptions")) { |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
670
diff
changeset
|
3895 |
PrintVMOptions = false; |
27244
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3896 |
continue; |
961
7fb3b13d4205
6726999: nsk/stress/jck12a/jck12a010 assert(n != null,"Bad immediate dominator info.")
kvn
parents:
670
diff
changeset
|
3897 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3898 |
if (match_option(option, "-XX:+IgnoreUnrecognizedVMOptions")) { |
2028 | 3899 |
IgnoreUnrecognizedVMOptions = true; |
27244
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3900 |
continue; |
2028 | 3901 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3902 |
if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions")) { |
2028 | 3903 |
IgnoreUnrecognizedVMOptions = false; |
27244
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3904 |
continue; |
2028 | 3905 |
} |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3906 |
if (match_option(option, "-XX:+PrintFlagsInitial")) { |
11441 | 3907 |
CommandLineFlags::printFlags(tty, false); |
4579 | 3908 |
vm_exit(0); |
3909 |
} |
|
30230
cee8d786f3f9
8067235: embedded/minvm/checknmt fails on compact1 and compact2 with minimal VM
dholmes
parents:
30130
diff
changeset
|
3910 |
if (match_option(option, "-XX:NativeMemoryTracking", &tail)) { |
25946 | 3911 |
#if INCLUDE_NMT |
3912 |
// The launcher did not setup nmt environment variable properly. |
|
26138
d0be5ee90363
8054547: Re-enable warning for incompatible java launcher
zgu
parents:
25950
diff
changeset
|
3913 |
if (!MemTracker::check_launcher_nmt_support(tail)) { |
d0be5ee90363
8054547: Re-enable warning for incompatible java launcher
zgu
parents:
25950
diff
changeset
|
3914 |
warning("Native Memory Tracking did not setup properly, using wrong launcher?"); |
d0be5ee90363
8054547: Re-enable warning for incompatible java launcher
zgu
parents:
25950
diff
changeset
|
3915 |
} |
25946 | 3916 |
|
3917 |
// Verify if nmt option is valid. |
|
3918 |
if (MemTracker::verify_nmt_option()) { |
|
3919 |
// Late initialization, still in single-threaded mode. |
|
3920 |
if (MemTracker::tracking_level() >= NMT_summary) { |
|
3921 |
MemTracker::init(); |
|
3922 |
} |
|
3923 |
} else { |
|
3924 |
vm_exit_during_initialization("Syntax error, expecting -XX:NativeMemoryTracking=[off|summary|detail]", NULL); |
|
3925 |
} |
|
27244
a2bd9d3112d4
8060256: The loop in Arguments::parse() can be enhanced.
jiangli
parents:
27166
diff
changeset
|
3926 |
continue; |
30230
cee8d786f3f9
8067235: embedded/minvm/checknmt fails on compact1 and compact2 with minimal VM
dholmes
parents:
30130
diff
changeset
|
3927 |
#else |
cee8d786f3f9
8067235: embedded/minvm/checknmt fails on compact1 and compact2 with minimal VM
dholmes
parents:
30130
diff
changeset
|
3928 |
jio_fprintf(defaultStream::error_stream(), |
cee8d786f3f9
8067235: embedded/minvm/checknmt fails on compact1 and compact2 with minimal VM
dholmes
parents:
30130
diff
changeset
|
3929 |
"Native Memory Tracking is not supported in this VM\n"); |
cee8d786f3f9
8067235: embedded/minvm/checknmt fails on compact1 and compact2 with minimal VM
dholmes
parents:
30130
diff
changeset
|
3930 |
return JNI_ERR; |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
3931 |
#endif |
30230
cee8d786f3f9
8067235: embedded/minvm/checknmt fails on compact1 and compact2 with minimal VM
dholmes
parents:
30130
diff
changeset
|
3932 |
} |
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6415
diff
changeset
|
3933 |
|
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6415
diff
changeset
|
3934 |
#ifndef PRODUCT |
28034
f46051dc7d51
6522873: Java not print "Unrecognized option" when it is invalid option.
jwilhelm
parents:
27926
diff
changeset
|
3935 |
if (match_option(option, "-XX:+PrintFlagsWithComments")) { |
11441 | 3936 |
CommandLineFlags::printFlags(tty, true); |
6438
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6415
diff
changeset
|
3937 |
vm_exit(0); |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6415
diff
changeset
|
3938 |
} |
ace4f8100e90
6979444: add command line option to print command line flags descriptions
ikrylov
parents:
6415
diff
changeset
|
3939 |
#endif |
2028 | 3940 |
} |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3941 |
return JNI_OK; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3942 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3943 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3944 |
static void print_options(const JavaVMInitArgs *args) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3945 |
const char* tail; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3946 |
for (int index = 0; index < args->nOptions; index++) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3947 |
const JavaVMOption *option = args->options + index; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3948 |
if (match_option(option, "-XX:", &tail)) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3949 |
logOption(tail); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3950 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3951 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3952 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3953 |
|
35872
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3954 |
bool Arguments::handle_deprecated_print_gc_flags() { |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3955 |
if (PrintGC) { |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3956 |
log_warning(gc)("-XX:+PrintGC is deprecated. Will use -Xlog:gc instead."); |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3957 |
} |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3958 |
if (PrintGCDetails) { |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3959 |
log_warning(gc)("-XX:+PrintGCDetails is deprecated. Will use -Xlog:gc* instead."); |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3960 |
} |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3961 |
|
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3962 |
if (_gc_log_filename != NULL) { |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3963 |
// -Xloggc was used to specify a filename |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3964 |
const char* gc_conf = PrintGCDetails ? "gc*" : "gc"; |
40924 | 3965 |
|
3966 |
LogTarget(Error, logging) target; |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46655
diff
changeset
|
3967 |
LogStream errstream(target); |
40924 | 3968 |
return LogConfiguration::parse_log_arguments(_gc_log_filename, gc_conf, NULL, NULL, &errstream); |
35872
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3969 |
} else if (PrintGC || PrintGCDetails) { |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3970 |
LogConfiguration::configure_stdout(LogLevel::Info, !PrintGCDetails, LOG_TAGS(gc)); |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3971 |
} |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3972 |
return true; |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3973 |
} |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
3974 |
|
41708
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3975 |
void Arguments::handle_extra_cms_flags(const char* msg) { |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3976 |
SpecialFlag flag; |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3977 |
const char *flag_name = "UseConcMarkSweepGC"; |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3978 |
if (lookup_special_flag(flag_name, flag)) { |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3979 |
handle_aliases_and_deprecation(flag_name, /* print warning */ true); |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3980 |
warning("%s", msg); |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3981 |
} |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3982 |
} |
82f5dc0dfccf
8155948: Add message for CMS deprecation for Oracle builds
jmasa
parents:
41281
diff
changeset
|
3983 |
|
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3984 |
// Parse entry point called from JNI_CreateJavaVM |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3985 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3986 |
jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) { |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
3987 |
assert(verify_special_jvm_flags(), "deprecated and obsolete flag table inconsistent"); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3988 |
|
38273
2634194d7555
8073500: Prevent certain commercial flags from being changed at runtime
gziemski
parents:
38259
diff
changeset
|
3989 |
// Initialize ranges, constraints and writeables |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3990 |
CommandLineFlagRangeList::init(); |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3991 |
CommandLineFlagConstraintList::init(); |
38273
2634194d7555
8073500: Prevent certain commercial flags from being changed at runtime
gziemski
parents:
38259
diff
changeset
|
3992 |
CommandLineFlagWriteableList::init(); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3993 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3994 |
// If flag "-XX:Flags=flags-file" is used it will be the first option to be processed. |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3995 |
const char* hotspotrc = ".hotspotrc"; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3996 |
bool settings_file_specified = false; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
3997 |
bool needs_hotspotrc_warning = false; |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3998 |
ScopedVMInitArgs initial_java_tool_options_args("env_var='JAVA_TOOL_OPTIONS'"); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
3999 |
ScopedVMInitArgs initial_java_options_args("env_var='_JAVA_OPTIONS'"); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4000 |
|
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4001 |
// Pointers to current working set of containers |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4002 |
JavaVMInitArgs* cur_cmd_args; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4003 |
JavaVMInitArgs* cur_java_options_args; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4004 |
JavaVMInitArgs* cur_java_tool_options_args; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4005 |
|
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4006 |
// Containers for modified/expanded options |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4007 |
ScopedVMInitArgs mod_cmd_args("cmd_line_args"); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4008 |
ScopedVMInitArgs mod_java_tool_options_args("env_var='JAVA_TOOL_OPTIONS'"); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4009 |
ScopedVMInitArgs mod_java_options_args("env_var='_JAVA_OPTIONS'"); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4010 |
|
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4011 |
|
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4012 |
jint code = |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4013 |
parse_java_tool_options_environment_variable(&initial_java_tool_options_args); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4014 |
if (code != JNI_OK) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4015 |
return code; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4016 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4017 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4018 |
code = parse_java_options_environment_variable(&initial_java_options_args); |
32621
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
4019 |
if (code != JNI_OK) { |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
4020 |
return code; |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
4021 |
} |
cdab920f3b6c
8061999: Enhance VM option parsing to allow options to be specified in a file
rdurbin
parents:
32619
diff
changeset
|
4022 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4023 |
code = expand_vm_options_as_needed(initial_java_tool_options_args.get(), |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4024 |
&mod_java_tool_options_args, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4025 |
&cur_java_tool_options_args); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4026 |
if (code != JNI_OK) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4027 |
return code; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4028 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4029 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4030 |
code = expand_vm_options_as_needed(initial_cmd_args, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4031 |
&mod_cmd_args, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4032 |
&cur_cmd_args); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4033 |
if (code != JNI_OK) { |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4034 |
return code; |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4035 |
} |
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4036 |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4037 |
code = expand_vm_options_as_needed(initial_java_options_args.get(), |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4038 |
&mod_java_options_args, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4039 |
&cur_java_options_args); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4040 |
if (code != JNI_OK) { |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4041 |
return code; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4042 |
} |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4043 |
|
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4044 |
const char* flags_file = Arguments::get_jvm_flags_file(); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4045 |
settings_file_specified = (flags_file != NULL); |
2028 | 4046 |
|
4047 |
if (IgnoreUnrecognizedVMOptions) { |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4048 |
cur_cmd_args->ignoreUnrecognized = true; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4049 |
cur_java_tool_options_args->ignoreUnrecognized = true; |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4050 |
cur_java_options_args->ignoreUnrecognized = true; |
2028 | 4051 |
} |
4052 |
||
4053 |
// Parse specified settings file |
|
4054 |
if (settings_file_specified) { |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4055 |
if (!process_settings_file(flags_file, true, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4056 |
cur_cmd_args->ignoreUnrecognized)) { |
2028 | 4057 |
return JNI_EINVAL; |
4058 |
} |
|
13194
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4059 |
} else { |
12981
b557c10f5444
7110720: Issue with vm config file loadingIssue with vm config file loading
kamg
parents:
11448
diff
changeset
|
4060 |
#ifdef ASSERT |
13194
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4061 |
// Parse default .hotspotrc settings file |
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4062 |
if (!process_settings_file(".hotspotrc", false, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4063 |
cur_cmd_args->ignoreUnrecognized)) { |
1 | 4064 |
return JNI_EINVAL; |
4065 |
} |
|
13194
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4066 |
#else |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4067 |
struct stat buf; |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4068 |
if (os::stat(hotspotrc, &buf) == 0) { |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4069 |
needs_hotspotrc_warning = true; |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4070 |
} |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4071 |
#endif |
1 | 4072 |
} |
4073 |
||
4074 |
if (PrintVMOptions) { |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4075 |
print_options(cur_java_tool_options_args); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4076 |
print_options(cur_cmd_args); |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4077 |
print_options(cur_java_options_args); |
1 | 4078 |
} |
4079 |
||
4080 |
// Parse JavaVMInitArgs structure passed in, as well as JAVA_TOOL_OPTIONS and _JAVA_OPTIONS |
|
35466
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4081 |
jint result = parse_vm_init_args(cur_java_tool_options_args, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4082 |
cur_java_options_args, |
4ace9ef0201b
8135198: Add -XX:VMOptionsFile support to JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
rdurbin
parents:
35219
diff
changeset
|
4083 |
cur_cmd_args); |
31853
c70929a2573c
8079301: Some command line options not settable via JAVA_TOOL_OPTIONS
jmanson
parents:
31783
diff
changeset
|
4084 |
|
1 | 4085 |
if (result != JNI_OK) { |
4086 |
return result; |
|
4087 |
} |
|
4088 |
||
17375
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
4089 |
// Call get_shared_archive_path() here, after possible SharedArchiveFile option got parsed. |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
4090 |
SharedArchivePath = get_shared_archive_path(); |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
4091 |
if (SharedArchivePath == NULL) { |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
4092 |
return JNI_ENOMEM; |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
4093 |
} |
e9554fd82263
8014138: Add VM option to facilitate the writing of CDS tests
hseigel
parents:
17369
diff
changeset
|
4094 |
|
27025 | 4095 |
// Set up VerifySharedSpaces |
4096 |
if (FLAG_IS_DEFAULT(VerifySharedSpaces) && SharedArchiveFile != NULL) { |
|
4097 |
VerifySharedSpaces = true; |
|
4098 |
} |
|
4099 |
||
13194
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4100 |
// Delay warning until here so that we've had a chance to process |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4101 |
// the -XX:-PrintWarnings flag |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4102 |
if (needs_hotspotrc_warning) { |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4103 |
warning("%s file is present but has been ignored. " |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4104 |
"Run with -XX:Flags=%s to load the file.", |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4105 |
hotspotrc, hotspotrc); |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4106 |
} |
603ef19adcb8
7167142: Consider a warning when finding a .hotspotrc or .hotspot_compiler file that isn't used
kamg
parents:
12989
diff
changeset
|
4107 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4108 |
if (needs_module_property_warning) { |
40896
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
4109 |
warning("Ignoring system property options whose names match the '-Djdk.module.*'." |
cff45787a061
8162412: Ignore any System property specified as -Djdk.module that matches reserved module system properties
hseigel
parents:
40244
diff
changeset
|
4110 |
" names that are reserved for internal use."); |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4111 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4112 |
|
30220
a56b855e11b9
8076057: aix: After 8075506, aix does not support large pages.
goetz
parents:
30201
diff
changeset
|
4113 |
#if defined(_ALLBSD_SOURCE) || defined(AIX) // UseLargePages is not yet supported on BSD and AIX. |
37253
45e69c7b0bac
8152929: Remove UNSUPPORTED_GC_OPTION, use UNSUPPORTED_OPTION instead
pliden
parents:
37237
diff
changeset
|
4114 |
UNSUPPORTED_OPTION(UseLargePages); |
14285
afa3d693e0f6
7191817: -XX:+UseSerialGC -XX:+UseLargePages crashes with SIGFPE on MacOS X
coleenp
parents:
14284
diff
changeset
|
4115 |
#endif |
afa3d693e0f6
7191817: -XX:+UseSerialGC -XX:+UseLargePages crashes with SIGFPE on MacOS X
coleenp
parents:
14284
diff
changeset
|
4116 |
|
28838
da47c3cc5c98
8067460: G1: TestResourceManagementFlagWithCommercialBuild.java failed on embedded platform
aharlap
parents:
28834
diff
changeset
|
4117 |
ArgumentsExt::report_unsupported_options(); |
da47c3cc5c98
8067460: G1: TestResourceManagementFlagWithCommercialBuild.java failed on embedded platform
aharlap
parents:
28834
diff
changeset
|
4118 |
|
1 | 4119 |
#ifndef PRODUCT |
4120 |
if (TraceBytecodesAt != 0) { |
|
4121 |
TraceBytecodes = true; |
|
4122 |
} |
|
4123 |
if (CountCompiledCalls) { |
|
4124 |
if (UseCounterDecay) { |
|
4125 |
warning("UseCounterDecay disabled because CountCalls is set"); |
|
4126 |
UseCounterDecay = false; |
|
4127 |
} |
|
4128 |
} |
|
4129 |
#endif // PRODUCT |
|
4130 |
||
24322 | 4131 |
if (ScavengeRootsInCode == 0) { |
3908
24b55ad4c228
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
3687
diff
changeset
|
4132 |
if (!FLAG_IS_DEFAULT(ScavengeRootsInCode)) { |
32823
ca8fef4cd57b
8066821: Enhance command line processing to manage deprecating and obsoleting -XX command line arguments
drwhite
parents:
32627
diff
changeset
|
4133 |
warning("Forcing ScavengeRootsInCode non-zero"); |
3908
24b55ad4c228
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
3687
diff
changeset
|
4134 |
} |
24b55ad4c228
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
3687
diff
changeset
|
4135 |
ScavengeRootsInCode = 1; |
24b55ad4c228
6863023: need non-perm oops in code cache for JSR 292
jrose
parents:
3687
diff
changeset
|
4136 |
} |
2534 | 4137 |
|
35872
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
4138 |
if (!handle_deprecated_print_gc_flags()) { |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
4139 |
return JNI_EINVAL; |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
4140 |
} |
7fb1e4de83ff
8145180: Add back PrintGC, PrintGCDetails and -Xloggc
brutisso
parents:
35520
diff
changeset
|
4141 |
|
5694
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
4142 |
// Set object alignment values. |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
4143 |
set_object_alignment(); |
1e0532a6abff
6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb
kvn
parents:
5419
diff
changeset
|
4144 |
|
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
4145 |
#if !INCLUDE_CDS |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4146 |
if (DumpSharedSpaces || RequireSharedSpaces) { |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4147 |
jio_fprintf(defaultStream::error_stream(), |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4148 |
"Shared spaces are not supported in this VM\n"); |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4149 |
return JNI_ERR; |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4150 |
} |
46522
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
46458
diff
changeset
|
4151 |
if ((UseSharedSpaces && FLAG_IS_CMDLINE(UseSharedSpaces)) || |
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
46458
diff
changeset
|
4152 |
log_is_enabled(Info, cds)) { |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4153 |
warning("Shared spaces are not supported in this VM"); |
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4154 |
FLAG_SET_DEFAULT(UseSharedSpaces, false); |
46522
86b13b03a053
8176132: -XX:+PrintSharedSpaces should be converted to use Unified Logging.
rprotacio
parents:
46458
diff
changeset
|
4155 |
LogConfiguration::configure_stdout(LogLevel::Off, true, LOG_TAGS(cds)); |
15936
4fda1079e8a3
8008310: Some adjustments needed to minimal VM warnings and errors for unsupported command line options
jprovino
parents:
15800
diff
changeset
|
4156 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25950
diff
changeset
|
4157 |
no_shared_spaces("CDS Disabled"); |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
4158 |
#endif // INCLUDE_CDS |
1 | 4159 |
|
19986
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
4160 |
return JNI_OK; |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
4161 |
} |
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
4162 |
|
33d188c66ed9
8010722: assert: failed: heap size is too big for compressed oops
tschatzl
parents:
19979
diff
changeset
|
4163 |
jint Arguments::apply_ergo() { |
1 | 4164 |
// Set flags based on ergonomics. |
47901
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
4165 |
jint result = set_ergonomics_flags(); |
4c42aa431f40
8189171: Move GC argument processing into GC specific classes
rkennke
parents:
47883
diff
changeset
|
4166 |
if (result != JNI_OK) return result; |
1 | 4167 |
|
43433
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
4168 |
#if INCLUDE_JVMCI |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
4169 |
set_jvmci_specific_flags(); |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
4170 |
#endif |
acc1d9072823
8166125: [JVMCI] Missing JVMCI flag default values
davleopo
parents:
42903
diff
changeset
|
4171 |
|
8681
c691d94813f9
7018056: large pages not always enabled by default
jcoomes
parents:
8476
diff
changeset
|
4172 |
set_shared_spaces_flags(); |
4564
55dfb20908d0
6893081: method handle & invokedynamic code needs additional cleanup (post 6815692, 6858164)
twisti
parents:
4560
diff
changeset
|
4173 |
|
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
4174 |
// Check the GC selections again. |
29696
01571dfab5be
8073944: Simplify ArgumentsExt and remove unneeded functionallity
sjohanss
parents:
29459
diff
changeset
|
4175 |
if (!check_gc_consistency()) { |
183
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
4176 |
return JNI_EINVAL; |
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
4177 |
} |
ba55c7f3fd45
6362677: Change parallel GC collector default number of parallel GC threads.
jmasa
parents:
1
diff
changeset
|
4178 |
|
6453 | 4179 |
if (TieredCompilation) { |
4180 |
set_tiered_flags(); |
|
4181 |
} else { |
|
31521
f57b2ce43484
8079775: Java 9-fastdebug ia32 Error: Unimplemented with "-XX:CompilationPolicyChoice=1 -XX:-TieredCompilation" options
iveresov
parents:
31390
diff
changeset
|
4182 |
int max_compilation_policy_choice = 1; |
f57b2ce43484
8079775: Java 9-fastdebug ia32 Error: Unimplemented with "-XX:CompilationPolicyChoice=1 -XX:-TieredCompilation" options
iveresov
parents:
31390
diff
changeset
|
4183 |
#ifdef COMPILER2 |
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
4184 |
if (is_server_compilation_mode_vm()) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
4185 |
max_compilation_policy_choice = 2; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
43433
diff
changeset
|
4186 |
} |
31521
f57b2ce43484
8079775: Java 9-fastdebug ia32 Error: Unimplemented with "-XX:CompilationPolicyChoice=1 -XX:-TieredCompilation" options
iveresov
parents:
31390
diff
changeset
|
4187 |
#endif |
f57b2ce43484
8079775: Java 9-fastdebug ia32 Error: Unimplemented with "-XX:CompilationPolicyChoice=1 -XX:-TieredCompilation" options
iveresov
parents:
31390
diff
changeset
|
4188 |
// Check if the policy is valid. |
f57b2ce43484
8079775: Java 9-fastdebug ia32 Error: Unimplemented with "-XX:CompilationPolicyChoice=1 -XX:-TieredCompilation" options
iveresov
parents:
31390
diff
changeset
|
4189 |
if (CompilationPolicyChoice >= max_compilation_policy_choice) { |
6453 | 4190 |
vm_exit_during_initialization( |
4191 |
"Incompatible compilation policy selected", NULL); |
|
4192 |
} |
|
27148
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
4193 |
// Scale CompileThreshold |
28928
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
4194 |
// CompileThresholdScaling == 0.0 is equivalent to -Xint and leaves CompileThreshold unchanged. |
e3815b017664
8072398: assert fails in L1RGenerator::increment_event_counter_impl
zmajo
parents:
28726
diff
changeset
|
4195 |
if (!FLAG_IS_DEFAULT(CompileThresholdScaling) && CompileThresholdScaling > 0.0) { |
28650
772aaab2582f
8059606: Enable per-method usage of CompileThresholdScaling (per-method compilation thresholds)
zmajo
parents:
28372
diff
changeset
|
4196 |
FLAG_SET_ERGO(intx, CompileThreshold, scaled_compile_threshold(CompileThreshold)); |
27148
a4b542d56e01
8059604: Add CompileThresholdScaling flag to control when methods are first compiled (with and withour TieredCompilation)
zmajo
parents:
27147
diff
changeset
|
4197 |
} |
6453 | 4198 |
} |
27147 | 4199 |
|
4200 |
#ifdef COMPILER2 |
|
4201 |
#ifndef PRODUCT |
|
4202 |
if (PrintIdealGraphLevel > 0) { |
|
4203 |
FLAG_SET_ERGO(bool, PrintIdealGraph, true); |
|
4204 |
} |
|
4205 |
#endif |
|
4206 |
#endif |
|
4207 |
||
8687
264727307495
6896099: Integrate CMS heap ergo with default heap sizing ergo
ysr
parents:
8685
diff
changeset
|
4208 |
// Set heap size based on available physical memory |
264727307495
6896099: Integrate CMS heap ergo with default heap sizing ergo
ysr
parents:
8685
diff
changeset
|
4209 |
set_heap_size(); |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13925
diff
changeset
|
4210 |
|
27892
06a143c836ad
8065305: Make it possible to extend the G1CollectorPolicy
jwilhelm
parents:
27686
diff
changeset
|
4211 |
ArgumentsExt::set_gc_specific_flags(); |
1 | 4212 |
|
22551 | 4213 |
// Initialize Metaspace flags and alignments |
20406
934f0b12daa9
8024547: MaxMetaspaceSize should limit the committed memory used by the metaspaces
stefank
parents:
20399
diff
changeset
|
4214 |
Metaspace::ergo_initialize(); |
934f0b12daa9
8024547: MaxMetaspaceSize should limit the committed memory used by the metaspaces
stefank
parents:
20399
diff
changeset
|
4215 |
|
1 | 4216 |
// Set bytecode rewriting flags |
4217 |
set_bytecode_flags(); |
|
4218 |
||
22551 | 4219 |
// Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled |
32595
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
4220 |
jint code = set_aggressive_opts_flags(); |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
4221 |
if (code != JNI_OK) { |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
4222 |
return code; |
8cde9aca5e9f
8132725: Memory leak in Arguments::add_property function
ddmitriev
parents:
32366
diff
changeset
|
4223 |
} |
1 | 4224 |
|
8309
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4225 |
// Turn off biased locking for locking debug mode flags, |
22551 | 4226 |
// which are subtly different from each other but neither works with |
4227 |
// biased locking |
|
8650 | 4228 |
if (UseHeavyMonitors |
4229 |
#ifdef COMPILER1 |
|
4230 |
|| !UseFastLocking |
|
4231 |
#endif // COMPILER1 |
|
33160
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
4232 |
#if INCLUDE_JVMCI |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
4233 |
|| !JVMCIUseFastLocking |
c59f1676d27e
8136421: JEP 243: Java-Level JVM Compiler Interface
twisti
parents:
32823
diff
changeset
|
4234 |
#endif |
8650 | 4235 |
) { |
8309
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4236 |
if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4237 |
// flag set to true on command line; warn the user that they |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4238 |
// can't enable biased locking here |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4239 |
warning("Biased Locking is not supported with locking debug flags" |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4240 |
"; ignoring UseBiasedLocking flag." ); |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4241 |
} |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4242 |
UseBiasedLocking = false; |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4243 |
} |
e5c9c706242b
6840152: JVM crashes when heavyweight monitors are used
coleenp
parents:
8075
diff
changeset
|
4244 |
|
35214 | 4245 |
#ifdef CC_INTERP |
22836
e7e511228518
8024468: PPC64 (part 201): cppInterpreter: implement bytecode profiling
goetz
parents:
22828
diff
changeset
|
4246 |
// Clear flags not supported on zero. |
4560 | 4247 |
FLAG_SET_DEFAULT(ProfileInterpreter, false); |
1 | 4248 |
FLAG_SET_DEFAULT(UseBiasedLocking, false); |
4560 | 4249 |
LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false)); |
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
4250 |
LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedClassPointers, false)); |
4560 | 4251 |
#endif // CC_INTERP |
4252 |
||
1500
bea9a90f3e8f
6462850: generate biased locking code in C2 ideal graph
kvn
parents:
1496
diff
changeset
|
4253 |
#ifdef COMPILER2 |
11445 | 4254 |
if (!EliminateLocks) { |
4255 |
EliminateNestedLocks = false; |
|
4256 |
} |
|
15113 | 4257 |
if (!Inline) { |
4258 |
IncrementalInline = false; |
|
4259 |
} |
|
4260 |
#ifndef PRODUCT |
|
4261 |
if (!IncrementalInline) { |
|
4262 |
AlwaysIncrementalInline = false; |
|
4263 |
} |
|
4264 |
#endif |
|
21099 | 4265 |
if (!UseTypeSpeculation && FLAG_IS_DEFAULT(TypeProfileLevel)) { |
4266 |
// nothing to use the profiling, turn if off |
|
4267 |
FLAG_SET_DEFAULT(TypeProfileLevel, 0); |
|
4268 |
} |
|
1500
bea9a90f3e8f
6462850: generate biased locking code in C2 ideal graph
kvn
parents:
1496
diff
changeset
|
4269 |
#endif |
bea9a90f3e8f
6462850: generate biased locking code in C2 ideal graph
kvn
parents:
1496
diff
changeset
|
4270 |
|
4584
e2a449e8cc6f
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
4579
diff
changeset
|
4271 |
if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) { |
e2a449e8cc6f
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
4579
diff
changeset
|
4272 |
warning("PrintAssembly is enabled; turning on DebugNonSafepoints to gain additional output"); |
e2a449e8cc6f
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
4579
diff
changeset
|
4273 |
DebugNonSafepoints = true; |
e2a449e8cc6f
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
4579
diff
changeset
|
4274 |
} |
e2a449e8cc6f
6912062: disassembler plugin needs to produce symbolic information in product mode
jrose
parents:
4579
diff
changeset
|
4275 |
|
19979
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
4276 |
if (FLAG_IS_CMDLINE(CompressedClassSpaceSize) && !UseCompressedClassPointers) { |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
4277 |
warning("Setting CompressedClassSpaceSize has no effect when compressed class pointers are not used"); |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
4278 |
} |
ebe1dbb6e1aa
8015107: NPG: Use consistent naming for metaspace concepts
ehelin
parents:
19732
diff
changeset
|
4279 |
|
38044
a2a381c8b429
8072428: Enable UseLoopCounter ergonomically if on-stack-replacement is enabled
zmajo
parents:
37296
diff
changeset
|
4280 |
if (UseOnStackReplacement && !UseLoopCounter) { |
a2a381c8b429
8072428: Enable UseLoopCounter ergonomically if on-stack-replacement is enabled
zmajo
parents:
37296
diff
changeset
|
4281 |
warning("On-stack-replacement requires loop counters; enabling loop counters"); |
a2a381c8b429
8072428: Enable UseLoopCounter ergonomically if on-stack-replacement is enabled
zmajo
parents:
37296
diff
changeset
|
4282 |
FLAG_SET_DEFAULT(UseLoopCounter, true); |
a2a381c8b429
8072428: Enable UseLoopCounter ergonomically if on-stack-replacement is enabled
zmajo
parents:
37296
diff
changeset
|
4283 |
} |
a2a381c8b429
8072428: Enable UseLoopCounter ergonomically if on-stack-replacement is enabled
zmajo
parents:
37296
diff
changeset
|
4284 |
|
4736
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4590
diff
changeset
|
4285 |
#ifndef PRODUCT |
20010
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
4286 |
if (!LogVMOutput && FLAG_IS_DEFAULT(LogVMOutput)) { |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
4287 |
if (use_vm_log()) { |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
4288 |
LogVMOutput = true; |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
4289 |
} |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
4290 |
} |
c66a7254680c
8023134: Rename VM LogFile to hotspot_pid{pid}.log (was hotspot.log)
vlivanov
parents:
19679
diff
changeset
|
4291 |
#endif // PRODUCT |
4736
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4590
diff
changeset
|
4292 |
|
1 | 4293 |
if (PrintCommandLineFlags) { |
11441 | 4294 |
CommandLineFlags::printSetFlags(tty); |
1 | 4295 |
} |
4296 |
||
6176
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4297 |
// Apply CPU specific policy for the BiasedLocking |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4298 |
if (UseBiasedLocking) { |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4299 |
if (!VM_Version::use_biased_locking() && |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4300 |
!(FLAG_IS_CMDLINE(UseBiasedLocking))) { |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4301 |
UseBiasedLocking = false; |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4302 |
} |
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4303 |
} |
23491 | 4304 |
#ifdef COMPILER2 |
4305 |
if (!UseBiasedLocking || EmitSync != 0) { |
|
4306 |
UseOptoBiasInlining = false; |
|
4307 |
} |
|
4308 |
#endif |
|
6176
4d9030fe341f
6953477: Increase portability and flexibility of building Hotspot
bobv
parents:
6174
diff
changeset
|
4309 |
|
47881
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4310 |
bool aot_enabled = UseAOT && AOTLibrary != NULL; |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4311 |
bool jvmci_enabled = NOT_JVMCI(false) JVMCI_ONLY(EnableJVMCI || UseJVMCICompiler); |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4312 |
bool handshakes_supported = SafepointMechanism::supports_thread_local_poll() && !aot_enabled && !jvmci_enabled && ThreadLocalHandshakes; |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4313 |
// ThreadLocalHandshakesConstraintFunc handles the constraints. |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4314 |
// Here we try to figure out if a mutual exclusive option have been set that conflict with a default. |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4315 |
if (handshakes_supported) { |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4316 |
FLAG_SET_DEFAULT(UseAOT, false); // Clear the AOT flag to make sure it doesn't try to initialize. |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4317 |
} else { |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4318 |
if (FLAG_IS_DEFAULT(ThreadLocalHandshakes) && ThreadLocalHandshakes) { |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4319 |
if (aot_enabled) { |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4320 |
// If user enabled AOT but ThreadLocalHandshakes is at default set it to false. |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4321 |
log_debug(ergo)("Disabling ThreadLocalHandshakes for UseAOT."); |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4322 |
FLAG_SET_DEFAULT(ThreadLocalHandshakes, false); |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4323 |
} else if (jvmci_enabled){ |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4324 |
// If user enabled JVMCI but ThreadLocalHandshakes is at default set it to false. |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4325 |
log_debug(ergo)("Disabling ThreadLocalHandshakes for EnableJVMCI/UseJVMCICompiler."); |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4326 |
FLAG_SET_DEFAULT(ThreadLocalHandshakes, false); |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4327 |
} |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4328 |
} |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4329 |
} |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4330 |
if (FLAG_IS_DEFAULT(ThreadLocalHandshakes) || !SafepointMechanism::supports_thread_local_poll()) { |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4331 |
log_debug(ergo)("ThreadLocalHandshakes %s", ThreadLocalHandshakes ? "enabled." : "disabled."); |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4332 |
} else { |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4333 |
log_info(ergo)("ThreadLocalHandshakes %s", ThreadLocalHandshakes ? "enabled." : "disabled."); |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4334 |
} |
0ce0ac68ace7
8189941: Implementation JEP 312: Thread-local handshake
rehn
parents:
47821
diff
changeset
|
4335 |
|
1 | 4336 |
return JNI_OK; |
4337 |
} |
|
4338 |
||
14580
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4339 |
jint Arguments::adjust_after_os() { |
22763 | 4340 |
if (UseNUMA) { |
4341 |
if (UseParallelGC || UseParallelOldGC) { |
|
14580
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4342 |
if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) { |
22763 | 4343 |
FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M); |
14580
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4344 |
} |
22763 | 4345 |
} |
4346 |
// UseNUMAInterleaving is set to ON for all collectors and |
|
4347 |
// platforms when UseNUMA is set to ON. NUMA-aware collectors |
|
4348 |
// such as the parallel collector for Linux and Solaris will |
|
4349 |
// interleave old gen and survivor spaces on top of NUMA |
|
4350 |
// allocation policy for the eden space. |
|
4351 |
// Non NUMA-aware collectors such as CMS, G1 and Serial-GC on |
|
4352 |
// all platforms and ParallelGC on Windows will interleave all |
|
4353 |
// of the heap spaces across NUMA nodes. |
|
4354 |
if (FLAG_IS_DEFAULT(UseNUMAInterleaving)) { |
|
4355 |
FLAG_SET_ERGO(bool, UseNUMAInterleaving, true); |
|
14580
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4356 |
} |
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4357 |
} |
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4358 |
return JNI_OK; |
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4359 |
} |
3e2316663327
7198334: UseNUMA modifies system parameters on non-NUMA system
brutisso
parents:
14487
diff
changeset
|
4360 |
|
1 | 4361 |
int Arguments::PropertyList_count(SystemProperty* pl) { |
4362 |
int count = 0; |
|
4363 |
while(pl != NULL) { |
|
4364 |
count++; |
|
4365 |
pl = pl->next(); |
|
4366 |
} |
|
4367 |
return count; |
|
4368 |
} |
|
4369 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4370 |
// Return the number of readable properties. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4371 |
int Arguments::PropertyList_readable_count(SystemProperty* pl) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4372 |
int count = 0; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4373 |
while(pl != NULL) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4374 |
if (pl->is_readable()) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4375 |
count++; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4376 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4377 |
pl = pl->next(); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4378 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4379 |
return count; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4380 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4381 |
|
1 | 4382 |
const char* Arguments::PropertyList_get_value(SystemProperty *pl, const char* key) { |
4383 |
assert(key != NULL, "just checking"); |
|
4384 |
SystemProperty* prop; |
|
4385 |
for (prop = pl; prop != NULL; prop = prop->next()) { |
|
4386 |
if (strcmp(key, prop->key()) == 0) return prop->value(); |
|
4387 |
} |
|
4388 |
return NULL; |
|
4389 |
} |
|
4390 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4391 |
// Return the value of the requested property provided that it is a readable property. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4392 |
const char* Arguments::PropertyList_get_readable_value(SystemProperty *pl, const char* key) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4393 |
assert(key != NULL, "just checking"); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4394 |
SystemProperty* prop; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4395 |
// Return the property value if the keys match and the property is not internal or |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4396 |
// it's the special internal property "jdk.boot.class.path.append". |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4397 |
for (prop = pl; prop != NULL; prop = prop->next()) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4398 |
if (strcmp(key, prop->key()) == 0) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4399 |
if (!prop->internal()) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4400 |
return prop->value(); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4401 |
} else if (strcmp(key, "jdk.boot.class.path.append") == 0) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4402 |
return prop->value(); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4403 |
} else { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4404 |
// Property is internal and not jdk.boot.class.path.append so return NULL. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4405 |
return NULL; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4406 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4407 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4408 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4409 |
return NULL; |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4410 |
} |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4411 |
|
1 | 4412 |
const char* Arguments::PropertyList_get_key_at(SystemProperty *pl, int index) { |
4413 |
int count = 0; |
|
4414 |
const char* ret_val = NULL; |
|
4415 |
||
4416 |
while(pl != NULL) { |
|
4417 |
if(count >= index) { |
|
4418 |
ret_val = pl->key(); |
|
4419 |
break; |
|
4420 |
} |
|
4421 |
count++; |
|
4422 |
pl = pl->next(); |
|
4423 |
} |
|
4424 |
||
4425 |
return ret_val; |
|
4426 |
} |
|
4427 |
||
4428 |
char* Arguments::PropertyList_get_value_at(SystemProperty* pl, int index) { |
|
4429 |
int count = 0; |
|
4430 |
char* ret_val = NULL; |
|
4431 |
||
4432 |
while(pl != NULL) { |
|
4433 |
if(count >= index) { |
|
4434 |
ret_val = pl->value(); |
|
4435 |
break; |
|
4436 |
} |
|
4437 |
count++; |
|
4438 |
pl = pl->next(); |
|
4439 |
} |
|
4440 |
||
4441 |
return ret_val; |
|
4442 |
} |
|
4443 |
||
4444 |
void Arguments::PropertyList_add(SystemProperty** plist, SystemProperty *new_p) { |
|
4445 |
SystemProperty* p = *plist; |
|
4446 |
if (p == NULL) { |
|
4447 |
*plist = new_p; |
|
4448 |
} else { |
|
4449 |
while (p->next() != NULL) { |
|
4450 |
p = p->next(); |
|
4451 |
} |
|
4452 |
p->set_next(new_p); |
|
4453 |
} |
|
4454 |
} |
|
4455 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4456 |
void Arguments::PropertyList_add(SystemProperty** plist, const char* k, const char* v, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4457 |
bool writeable, bool internal) { |
1 | 4458 |
if (plist == NULL) |
4459 |
return; |
|
4460 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4461 |
SystemProperty* new_p = new SystemProperty(k, v, writeable, internal); |
1 | 4462 |
PropertyList_add(plist, new_p); |
4463 |
} |
|
4464 |
||
28372
ce0aad4b8c44
8064457: Introduce compressed oops mode disjoint base and improve compressed heap handling.
goetz
parents:
28214
diff
changeset
|
4465 |
void Arguments::PropertyList_add(SystemProperty *element) { |
ce0aad4b8c44
8064457: Introduce compressed oops mode disjoint base and improve compressed heap handling.
goetz
parents:
28214
diff
changeset
|
4466 |
PropertyList_add(&_system_properties, element); |
ce0aad4b8c44
8064457: Introduce compressed oops mode disjoint base and improve compressed heap handling.
goetz
parents:
28214
diff
changeset
|
4467 |
} |
ce0aad4b8c44
8064457: Introduce compressed oops mode disjoint base and improve compressed heap handling.
goetz
parents:
28214
diff
changeset
|
4468 |
|
1 | 4469 |
// This add maintains unique property key in the list. |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4470 |
void Arguments::PropertyList_unique_add(SystemProperty** plist, const char* k, const char* v, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4471 |
PropertyAppendable append, PropertyWriteable writeable, |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4472 |
PropertyInternal internal) { |
1 | 4473 |
if (plist == NULL) |
4474 |
return; |
|
4475 |
||
4476 |
// If property key exist then update with new value. |
|
4477 |
SystemProperty* prop; |
|
4478 |
for (prop = *plist; prop != NULL; prop = prop->next()) { |
|
4479 |
if (strcmp(k, prop->key()) == 0) { |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4480 |
if (append == AppendProperty) { |
2358 | 4481 |
prop->append_value(v); |
4482 |
} else { |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4483 |
prop->set_value(v); |
2358 | 4484 |
} |
1 | 4485 |
return; |
4486 |
} |
|
4487 |
} |
|
4488 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40093
diff
changeset
|
4489 |
PropertyList_add(plist, k, v, writeable == WriteableProperty, internal == InternalProperty); |
1 | 4490 |
} |
4491 |
||
4492 |
// Copies src into buf, replacing "%%" with "%" and "%p" with pid |
|
4493 |
// Returns true if all of the source pointed by src has been copied over to |
|
4494 |
// the destination buffer pointed by buf. Otherwise, returns false. |
|
4495 |
// Notes: |
|
4496 |
// 1. If the length (buflen) of the destination buffer excluding the |
|
4497 |
// NULL terminator character is not long enough for holding the expanded |
|
4498 |
// pid characters, it also returns false instead of returning the partially |
|
4499 |
// expanded one. |
|
4500 |
// 2. The passed in "buflen" should be large enough to hold the null terminator. |
|
4501 |
bool Arguments::copy_expand_pid(const char* src, size_t srclen, |
|
4502 |
char* buf, size_t buflen) { |
|
4503 |
const char* p = src; |
|
4504 |
char* b = buf; |
|
4505 |
const char* src_end = &src[srclen]; |
|
4506 |
char* buf_end = &buf[buflen - 1]; |
|
4507 |
||
4508 |
while (p < src_end && b < buf_end) { |
|
4509 |
if (*p == '%') { |
|
4510 |
switch (*(++p)) { |
|
4511 |
case '%': // "%%" ==> "%" |
|
4512 |
*b++ = *p++; |
|
4513 |
break; |
|
4514 |
case 'p': { // "%p" ==> current process id |
|
4515 |
// buf_end points to the character before the last character so |
|
4516 |
// that we could write '\0' to the end of the buffer. |
|
4517 |
size_t buf_sz = buf_end - b + 1; |
|
4518 |
int ret = jio_snprintf(b, buf_sz, "%d", os::current_process_id()); |
|
4519 |
||
4520 |
// if jio_snprintf fails or the buffer is not long enough to hold |
|
4521 |
// the expanded pid, returns false. |
|
4522 |
if (ret < 0 || ret >= (int)buf_sz) { |
|
4523 |
return false; |
|
4524 |
} else { |
|
4525 |
b += ret; |
|
4526 |
assert(*b == '\0', "fail in copy_expand_pid"); |
|
4527 |
if (p == src_end && b == buf_end + 1) { |
|
4528 |
// reach the end of the buffer. |
|
4529 |
return true; |
|
4530 |
} |
|
4531 |
} |
|
4532 |
p++; |
|
4533 |
break; |
|
4534 |
} |
|
4535 |
default : |
|
4536 |
*b++ = '%'; |
|
4537 |
} |
|
4538 |
} else { |
|
4539 |
*b++ = *p++; |
|
4540 |
} |
|
4541 |
} |
|
4542 |
*b = '\0'; |
|
4543 |
return (p == src_end); // return false if not all of the source was copied |
|
4544 |
} |