src/share/vm/runtime/arguments.cpp

changeset 2785
f177ddd59c60
parent 2698
38fea01eb669
parent 2783
eda9eb483d29
child 2787
5d046bf49ce7
equal deleted inserted replaced
2784:92add02409c9 2785:f177ddd59c60
241 { "HandlePromotionFailure", 241 { "HandlePromotionFailure",
242 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) }, 242 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
243 { "MaxLiveObjectEvacuationRatio", 243 { "MaxLiveObjectEvacuationRatio",
244 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) }, 244 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
245 { "ForceSharedSpaces", JDK_Version::jdk_update(6,25), JDK_Version::jdk(8) }, 245 { "ForceSharedSpaces", JDK_Version::jdk_update(6,25), JDK_Version::jdk(8) },
246 { "UseParallelOldGCCompacting",
247 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
248 { "UseParallelDensePrefixUpdate",
249 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
250 { "UseParallelOldGCDensePrefix",
251 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
246 { NULL, JDK_Version(0), JDK_Version(0) } 252 { NULL, JDK_Version(0), JDK_Version(0) }
247 }; 253 };
248 254
249 // Returns true if the flag is obsolete and fits into the range specified 255 // Returns true if the flag is obsolete and fits into the range specified
250 // for being ignored. In the case that the flag is ignored, the 'version' 256 // for being ignored. In the case that the flag is ignored, the 'version'
797 bool Arguments::process_argument(const char* arg, 803 bool Arguments::process_argument(const char* arg,
798 jboolean ignore_unrecognized, FlagValueOrigin origin) { 804 jboolean ignore_unrecognized, FlagValueOrigin origin) {
799 805
800 JDK_Version since = JDK_Version(); 806 JDK_Version since = JDK_Version();
801 807
802 if (parse_argument(arg, origin)) { 808 if (parse_argument(arg, origin) || ignore_unrecognized) {
803 // do nothing 809 return true;
804 } else if (is_newly_obsolete(arg, &since)) { 810 }
805 enum { bufsize = 256 }; 811
806 char buffer[bufsize]; 812 const char * const argname = *arg == '+' || *arg == '-' ? arg + 1 : arg;
807 since.to_string(buffer, bufsize); 813 if (is_newly_obsolete(arg, &since)) {
808 jio_fprintf(defaultStream::error_stream(), 814 char version[256];
809 "Warning: The flag %s has been EOL'd as of %s and will" 815 since.to_string(version, sizeof(version));
810 " be ignored\n", arg, buffer); 816 warning("ignoring option %s; support was removed in %s", argname, version);
811 } else { 817 return true;
812 if (!ignore_unrecognized) { 818 }
813 jio_fprintf(defaultStream::error_stream(), 819
814 "Unrecognized VM option '%s'\n", arg); 820 jio_fprintf(defaultStream::error_stream(),
815 // allow for commandline "commenting out" options like -XX:#+Verbose 821 "Unrecognized VM option '%s'\n", argname);
816 if (strlen(arg) == 0 || arg[0] != '#') { 822 // allow for commandline "commenting out" options like -XX:#+Verbose
817 return false; 823 return arg[0] == '#';
818 }
819 }
820 }
821 return true;
822 } 824 }
823 825
824 bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) { 826 bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) {
825 FILE* stream = fopen(file_name, "rb"); 827 FILE* stream = fopen(file_name, "rb");
826 if (stream == NULL) { 828 if (stream == NULL) {

mercurial