Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 3261:732454aaf5cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jmasa
date Wed, 20 Apr 2011 20:32:45 -0700
parents 3449f5e02cc4 5d046bf49ce7
children da0fffdcc453 6c978a541c03 e9b8ef09622a
comparison
equal deleted inserted replaced
3247:df8a1555b1ea 3261:732454aaf5cb
242 { "HandlePromotionFailure", 242 { "HandlePromotionFailure",
243 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) }, 243 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
244 { "MaxLiveObjectEvacuationRatio", 244 { "MaxLiveObjectEvacuationRatio",
245 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) }, 245 JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
246 { "ForceSharedSpaces", JDK_Version::jdk_update(6,25), JDK_Version::jdk(8) }, 246 { "ForceSharedSpaces", JDK_Version::jdk_update(6,25), JDK_Version::jdk(8) },
247 { "UseParallelOldGCCompacting",
248 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
249 { "UseParallelDensePrefixUpdate",
250 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
251 { "UseParallelOldGCDensePrefix",
252 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
247 { "AllowTransitionalJSR292", JDK_Version::jdk(7), JDK_Version::jdk(8) }, 253 { "AllowTransitionalJSR292", JDK_Version::jdk(7), JDK_Version::jdk(8) },
248 { NULL, JDK_Version(0), JDK_Version(0) } 254 { NULL, JDK_Version(0), JDK_Version(0) }
249 }; 255 };
250 256
251 // Returns true if the flag is obsolete and fits into the range specified 257 // Returns true if the flag is obsolete and fits into the range specified
799 bool Arguments::process_argument(const char* arg, 805 bool Arguments::process_argument(const char* arg,
800 jboolean ignore_unrecognized, FlagValueOrigin origin) { 806 jboolean ignore_unrecognized, FlagValueOrigin origin) {
801 807
802 JDK_Version since = JDK_Version(); 808 JDK_Version since = JDK_Version();
803 809
804 if (parse_argument(arg, origin)) { 810 if (parse_argument(arg, origin) || ignore_unrecognized) {
805 // do nothing 811 return true;
806 } else if (is_newly_obsolete(arg, &since)) { 812 }
807 enum { bufsize = 256 }; 813
808 char buffer[bufsize]; 814 const char * const argname = *arg == '+' || *arg == '-' ? arg + 1 : arg;
809 since.to_string(buffer, bufsize); 815 if (is_newly_obsolete(arg, &since)) {
810 jio_fprintf(defaultStream::error_stream(), 816 char version[256];
811 "Warning: The flag %s has been EOL'd as of %s and will" 817 since.to_string(version, sizeof(version));
812 " be ignored\n", arg, buffer); 818 warning("ignoring option %s; support was removed in %s", argname, version);
813 } else { 819 return true;
814 if (!ignore_unrecognized) { 820 }
815 jio_fprintf(defaultStream::error_stream(), 821
816 "Unrecognized VM option '%s'\n", arg); 822 jio_fprintf(defaultStream::error_stream(),
817 // allow for commandline "commenting out" options like -XX:#+Verbose 823 "Unrecognized VM option '%s'\n", argname);
818 if (strlen(arg) == 0 || arg[0] != '#') { 824 // allow for commandline "commenting out" options like -XX:#+Verbose
819 return false; 825 return arg[0] == '#';
820 }
821 }
822 }
823 return true;
824 } 826 }
825 827
826 bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) { 828 bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) {
827 FILE* stream = fopen(file_name, "rb"); 829 FILE* stream = fopen(file_name, "rb");
828 if (stream == NULL) { 830 if (stream == NULL) {