truffle: src/share/vm/runtime/arguments.cpp comparison

comparison src/share/vm/runtime/arguments.cpp @ 276:aa8f54688692

Merge

author	trims
date	Sun, 10 Aug 2008 21:31:42 -0700
parents	b727c32788a9 4c5fa80d85da
children	93befa083681 1ee8caae33af

comparison

equal deleted inserted replaced

-:585535ec8a14
+:aa8f54688692
 // Set OS specific system properties values
 os::init_system_properties_values();
 }
-// String containing commands that will be ignored and cause a
+/**
-// warning to be issued.  These commands should be accepted
+* Provide a slightly more user-friendly way of eliminating -XX flags.
-// for 1.6 but not 1.7.  The string should be cleared at the
+* When a flag is eliminated, it can be added to this list in order to
-// beginning of 1.7.
+* continue accepting this flag on the command-line, while issuing a warning
-static const char*  obsolete_jvm_flags_1_5_0[] = {
+* and ignoring the value.  Once the JDK version reaches the 'accept_until'
-"UseTrainGC",
+* limit, we flatly refuse to admit the existence of the flag.  This allows
-"UseSpecialLargeObjectHandling",
+* a flag to die correctly over JDK releases using HSX.
-"UseOversizedCarHandling",
+*/
-"TraceCarAllocation",
+typedef struct {
-"PrintTrainGCProcessingStats",
+const char* name;
-"LogOfCarSpaceSize",
+JDK_Version obsoleted_in; // when the flag went away
-"OversizedCarThreshold",
+JDK_Version accept_until; // which version to start denying the existence
-"MinTickInterval",
+} ObsoleteFlag;
-"DefaultTickInterval",
-"MaxTickInterval",
+static ObsoleteFlag obsolete_jvm_flags[] = {
-"DelayTickAdjustment",
+{ "UseTrainGC",                    JDK_Version::jdk(5), JDK_Version::jdk(7) },
-"ProcessingToTenuringRatio",
+{ "UseSpecialLargeObjectHandling", JDK_Version::jdk(5), JDK_Version::jdk(7) },
-"MinTrainLength",
+{ "UseOversizedCarHandling",       JDK_Version::jdk(5), JDK_Version::jdk(7) },
-0};
+{ "TraceCarAllocation",            JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "PrintTrainGCProcessingStats",   JDK_Version::jdk(5), JDK_Version::jdk(7) },
-bool Arguments::made_obsolete_in_1_5_0(const char *s) {
+{ "LogOfCarSpaceSize",             JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "OversizedCarThreshold",         JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "MinTickInterval",               JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "DefaultTickInterval",           JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "MaxTickInterval",               JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "DelayTickAdjustment",           JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "ProcessingToTenuringRatio",     JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "MinTrainLength",                JDK_Version::jdk(5), JDK_Version::jdk(7) },
+{ "AppendRatio",         JDK_Version::jdk_update(6,10), JDK_Version::jdk(7) },
+{ NULL, JDK_Version(0), JDK_Version(0) }
+};
+// Returns true if the flag is obsolete and fits into the range specified
+// for being ignored.  In the case that the flag is ignored, the 'version'
+// value is filled in with the version number when the flag became
+// obsolete so that that value can be displayed to the user.
+bool Arguments::is_newly_obsolete(const char *s, JDK_Version* version) {
 int i = 0;
-while (obsolete_jvm_flags_1_5_0[i] != NULL) {
+assert(version != NULL, "Must provide a version buffer");
+while (obsolete_jvm_flags[i].name != NULL) {
+const ObsoleteFlag& flag_status = obsolete_jvm_flags[i];
 // <flag>=xxx form
 // [-|+]<flag> form
-if ((strncmp(obsolete_jvm_flags_1_5_0[i], s,
+if ((strncmp(flag_status.name, s, strlen(flag_status.name)) == 0) ||
-strlen(obsolete_jvm_flags_1_5_0[i])) == 0) ||
 ((s[0] == '+' || s[0] == '-') &&
-(strncmp(obsolete_jvm_flags_1_5_0[i], &s[1],
+(strncmp(flag_status.name, &s[1], strlen(flag_status.name)) == 0))) {
-strlen(obsolete_jvm_flags_1_5_0[i])) == 0))) {
+if (JDK_Version::current().compare(flag_status.accept_until) == -1) {
-return true;
+*version = flag_status.obsoleted_in;
+return true;
+}
 }
 i++;
 }
 return false;
 }
 }
 st->print_cr("");
 }
 }
-bool Arguments::process_argument(const char* arg, jboolean ignore_unrecognized, FlagValueOrigin origin) {
+bool Arguments::process_argument(const char* arg,
+jboolean ignore_unrecognized, FlagValueOrigin origin) {
+JDK_Version since = JDK_Version();
 if (parse_argument(arg, origin)) {
 // do nothing
-} else if (made_obsolete_in_1_5_0(arg)) {
+} else if (is_newly_obsolete(arg, &since)) {
+enum { bufsize = 256 };
+char buffer[bufsize];
+since.to_string(buffer, bufsize);
 jio_fprintf(defaultStream::error_stream(),
-"Warning: The flag %s has been EOL'd as of 1.5.0 and will"
+"Warning: The flag %s has been EOL'd as of %s and will"
-" be ignored\n", arg);
+" be ignored\n", arg, buffer);
 } else {
 if (!ignore_unrecognized) {
 jio_fprintf(defaultStream::error_stream(),
 "Unrecognized VM option '%s'\n", arg);
 // allow for commandline "commenting out" options like -XX:#+Verbose
 settings_file_specified = true;
 }
 if (match_option(option, "-XX:+PrintVMOptions", &tail)) {
 PrintVMOptions = true;
 }
+if (match_option(option, "-XX:-PrintVMOptions", &tail)) {
+PrintVMOptions = false;
+}
 }
 // Parse default .hotspotrc settings file
 if (!settings_file_specified) {
 if (!process_settings_file(".hotspotrc", false, args->ignoreUnrecognized)) {

Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 276:aa8f54688692