jdk-sandbox: comparison hotspot/src/share/vm/runtime/arguments.cpp

equal deleted inserted replaced

-:cd3fcc32cb49
+:405ab5976b58
 SysClassPath(const char* base);
 ~SysClassPath();
 inline void set_base(const char* base);
 inline void add_prefix(const char* prefix);
+inline void add_suffix_to_prefix(const char* suffix);
 inline void add_suffix(const char* suffix);
 inline void reset_path(const char* base);
 // Expand the jar/zip files in each directory listed by the java.endorsed.dirs
 // property.  Must be called after all command-line arguments have been
 _items[_scp_base] = base;
 }
 inline void SysClassPath::add_prefix(const char* prefix) {
 _items[_scp_prefix] = add_to_path(_items[_scp_prefix], prefix, true);
+}
+inline void SysClassPath::add_suffix_to_prefix(const char* suffix) {
+_items[_scp_prefix] = add_to_path(_items[_scp_prefix], suffix, false);
 }
 inline void SysClassPath::add_suffix(const char* suffix) {
 _items[_scp_suffix] = add_to_path(_items[_scp_suffix], suffix, false);
 }
 static bool set_bool_flag(char* name, bool value, FlagValueOrigin origin) {
 return CommandLineFlags::boolAtPut(name, &value, origin);
 }
 static bool set_fp_numeric_flag(char* name, char* value, FlagValueOrigin origin) {
 double v;
 if (sscanf(value, "%lf", &v) != 1) {
 return false;
 }
 if (CommandLineFlags::doubleAtPut(name, &v, origin)) {
 return true;
 }
 return false;
 }
 static bool set_numeric_flag(char* name, char* value, FlagValueOrigin origin) {
 julong v;
 intx intx_v;
 bool is_neg = false;
 if (!is_neg && CommandLineFlags::uintxAtPut(name, &uintx_v, origin)) {
 return true;
 }
 return false;
 }
 static bool set_string_flag(char* name, const char* value, FlagValueOrigin origin) {
 if (!CommandLineFlags::ccstrAtPut(name, &value, origin))  return false;
 // Contract:  CommandLineFlags always returns a pointer that needs freeing.
 FREE_C_HEAP_ARRAY(char, value);
 FREE_C_HEAP_ARRAY(char, free_this_too);
 }
 return true;
 }
 bool Arguments::parse_argument(const char* arg, FlagValueOrigin origin) {
 // range of acceptable characters spelled out for portability reasons
 #define NAME_RANGE  "[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]"
 #define BUFLEN 255
 return set_numeric_flag(name, value, origin);
 }
 return false;
 }
 void Arguments::add_string(char*** bldarray, int* count, const char* arg) {
 assert(bldarray != NULL, "illegal argument");
 if (arg == NULL) {
 }
 }
 }
 return true;
 }
 bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) {
 FILE* stream = fopen(file_name, "rb");
 if (stream == NULL) {
 if (should_exist) {
 ClipInlining             = false;
 break;
 }
 }
 // Conflict: required to use shared spaces (-Xshare:on), but
 // incompatible command line options were chosen.
 static void no_shared_spaces() {
 if (RequireSharedSpaces) {
 vm_exit_during_initialization("Unable to use shared archive.", NULL);
 } else {
 FLAG_SET_DEFAULT(UseSharedSpaces, false);
 }
 }
 // If the user has chosen ParallelGCThreads > 0, we set UseParNewGC
 // if it's not explictly set or unset. If the user has chosen
 // UseParNewGC and not explicitly set ParallelGCThreads we
 // set it, unless this is a single cpu machine.
 result = parse_each_vm_init_arg(args, &scp, &scp_assembly_required, COMMAND_LINE);
 if (result != JNI_OK) {
 return result;
 }
+if (AggressiveOpts) {
+// Insert alt-rt.jar between user-specified bootclasspath
+// prefix and the default bootclasspath.  os::set_boot_path()
+// uses meta_index_dir as the default bootclasspath directory.
+const char* altclasses_jar = "alt-rt.jar";
+size_t altclasses_path_len = strlen(get_meta_index_dir()) + 1 +
+strlen(altclasses_jar);
+char* altclasses_path = NEW_C_HEAP_ARRAY(char, altclasses_path_len);
+strcpy(altclasses_path, get_meta_index_dir());
+strcat(altclasses_path, altclasses_jar);
+scp.add_suffix_to_prefix(altclasses_path);
+scp_assembly_required = true;
+FREE_C_HEAP_ARRAY(char, altclasses_path);
+}
 // Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM)
 result = parse_java_options_environment_variable(&scp, &scp_assembly_required);
 if (result != JNI_OK) {
 return result;
 }
 return result;
 }
 return JNI_OK;
 }
 jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
 SysClassPath* scp_p,
 bool* scp_assembly_required_p,
 FlagValueOrigin origin) {
 } else if (match_option(option, "-Xbootclasspath/p:", &tail)) {
 scp_p->add_prefix(tail);
 *scp_assembly_required_p = true;
 // -Xrun
 } else if (match_option(option, "-Xrun", &tail)) {
-if(tail != NULL) {
+if (tail != NULL) {
 const char* pos = strchr(tail, ':');
 size_t len = (pos == NULL) ? strlen(tail) : pos - tail;
 char* name = (char*)memcpy(NEW_C_HEAP_ARRAY(char, len + 1), tail, len);
 name[len] = '\0';
 logOption(tail);
 }
 }
 }
 // Parse JavaVMInitArgs structure passed in, as well as JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
 jint result = parse_vm_init_args(args);
 if (result != JNI_OK) {
 return result;
 }

changeset 1907	405ab5976b58
parent 1889	24b003a6fe46
child 2034	ca0ff0c51e3b