Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/arguments.cpp @ 6913:acabb5c282f5 jdk8-b63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author lana
date Tue, 30 Oct 2012 13:56:59 -0700
parents d2582a08fa5d 8ebcedb7604d
children 8cb93eadfb6d
comparison
equal deleted inserted replaced
6912:cb829aa4c98e 6913:acabb5c282f5
789 } 789 }
790 if (num_jvm_args() > 0) { 790 if (num_jvm_args() > 0) {
791 st->print("jvm_args: "); print_jvm_args_on(st); 791 st->print("jvm_args: "); print_jvm_args_on(st);
792 } 792 }
793 st->print_cr("java_command: %s", java_command() ? java_command() : "<unknown>"); 793 st->print_cr("java_command: %s", java_command() ? java_command() : "<unknown>");
794 if (_java_class_path != NULL) {
795 char* path = _java_class_path->value();
796 st->print_cr("java_class_path (initial): %s", strlen(path) == 0 ? "<not set>" : path );
797 }
794 st->print_cr("Launcher Type: %s", _sun_java_launcher); 798 st->print_cr("Launcher Type: %s", _sun_java_launcher);
795 } 799 }
796 800
797 void Arguments::print_jvm_flags_on(outputStream* st) { 801 void Arguments::print_jvm_flags_on(outputStream* st) {
798 if (_num_jvm_flags > 0) { 802 if (_num_jvm_flags > 0) {
2769 option->optionString); 2773 option->optionString);
2770 describe_range_error(errcode); 2774 describe_range_error(errcode);
2771 return JNI_EINVAL; 2775 return JNI_EINVAL;
2772 } 2776 }
2773 FLAG_SET_CMDLINE(uintx, MaxDirectMemorySize, max_direct_memory_size); 2777 FLAG_SET_CMDLINE(uintx, MaxDirectMemorySize, max_direct_memory_size);
2778 } else if (match_option(option, "-XX:+UseVMInterruptibleIO", &tail)) {
2779 // NOTE! In JDK 9, the UseVMInterruptibleIO flag will completely go
2780 // away and will cause VM initialization failures!
2781 warning("-XX:+UseVMInterruptibleIO is obsolete and will be removed in a future release.");
2782 FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true);
2774 } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx 2783 } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
2775 // Skip -XX:Flags= since that case has already been handled 2784 // Skip -XX:Flags= since that case has already been handled
2776 if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) { 2785 if (strncmp(tail, "Flags=", strlen("Flags=")) != 0) {
2777 if (!process_argument(tail, args->ignoreUnrecognized, origin)) { 2786 if (!process_argument(tail, args->ignoreUnrecognized, origin)) {
2778 return JNI_EINVAL; 2787 return JNI_EINVAL;
2784 } 2793 }
2785 } 2794 }
2786 2795
2787 // Change the default value for flags which have different default values 2796 // Change the default value for flags which have different default values
2788 // when working with older JDKs. 2797 // when working with older JDKs.
2789 if (JDK_Version::current().compare_major(6) <= 0 &&
2790 FLAG_IS_DEFAULT(UseVMInterruptibleIO)) {
2791 FLAG_SET_DEFAULT(UseVMInterruptibleIO, true);
2792 }
2793 #ifdef LINUX 2798 #ifdef LINUX
2794 if (JDK_Version::current().compare_major(6) <= 0 && 2799 if (JDK_Version::current().compare_major(6) <= 0 &&
2795 FLAG_IS_DEFAULT(UseLinuxPosixThreadCPUClocks)) { 2800 FLAG_IS_DEFAULT(UseLinuxPosixThreadCPUClocks)) {
2796 FLAG_SET_DEFAULT(UseLinuxPosixThreadCPUClocks, false); 2801 FLAG_SET_DEFAULT(UseLinuxPosixThreadCPUClocks, false);
2797 } 2802 }