/hg/icedtea6: 2010-01-11 Gary Benson <gbenson at redhat.com>
gbenson at icedtea.classpath.org
gbenson at icedtea.classpath.org
Mon Jan 11 03:37:57 PST 2010
changeset 4b6ab0e5a0dd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4b6ab0e5a0dd
author: Gary Benson <gbenson at redhat.com>
date: Mon Jan 11 11:43:43 2010 +0000
2010-01-11 Gary Benson <gbenson at redhat.com>
* patches/zero/6914622.patch: New file, imports changeset
for Sun bug 6914622 from jdk7/hotspot-comp.
* Makefile.am (ICEDTEA_PATCHES): Added the above.
* contrib/checkopts/checkopts: Updated for the above.
diffstat:
4 files changed, 110 insertions(+), 1 deletion(-)
ChangeLog | 7 +++
Makefile.am | 1
contrib/checkopts/checkopts | 5 +-
patches/zero/6914622.patch | 98 +++++++++++++++++++++++++++++++++++++++++++
diffs (149 lines):
diff -r 175b5c7ee4c7 -r 4b6ab0e5a0dd ChangeLog
--- a/ChangeLog Wed Jan 06 16:40:43 2010 -0500
+++ b/ChangeLog Mon Jan 11 11:43:43 2010 +0000
@@ -1,3 +1,10 @@ 2010-01-06 Deepak Bhole <dbhole at redhat.
+2010-01-11 Gary Benson <gbenson at redhat.com>
+
+ * patches/zero/6914622.patch: New file, imports changeset
+ for Sun bug 6914622 from jdk7/hotspot-comp.
+ * Makefile.am (ICEDTEA_PATCHES): Added the above.
+ * contrib/checkopts/checkopts: Updated for the above.
+
2010-01-06 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.h: Remove debug specific line from
diff -r 175b5c7ee4c7 -r 4b6ab0e5a0dd Makefile.am
--- a/Makefile.am Wed Jan 06 16:40:43 2010 -0500
+++ b/Makefile.am Mon Jan 11 11:43:43 2010 +0000
@@ -201,6 +201,7 @@ ICEDTEA_PATCHES = \
patches/zero/6903453.patch \
patches/zero/6909153.patch \
patches/zero/6913869.patch \
+ patches/zero/6914622.patch \
patches/icedtea-notice-safepoints.patch \
patches/icedtea-parisc-opt.patch \
patches/icedtea-lucene-crash.patch \
diff -r 175b5c7ee4c7 -r 4b6ab0e5a0dd contrib/checkopts/checkopts
--- a/contrib/checkopts/checkopts Wed Jan 06 16:40:43 2010 -0500
+++ b/contrib/checkopts/checkopts Mon Jan 11 11:43:43 2010 +0000
@@ -23,6 +23,7 @@ class Flag:
def test_values(self):
if self.type == "bool":
if self.name in (
+ "PrintFlagsInitial", # already done :)
"ExtendedDTraceProbes", # Solaris only
"RequireSharedSpaces", # Not set up
"PauseAtStartup"): # Just don't...
@@ -62,7 +63,9 @@ class Main:
def read_flags(self):
out, err = subprocess.Popen(
- [self.java, "-XX:+UnlockDiagnosticVMOptions", "-Xprintflags"],
+ [self.java,
+ "-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+PrintFlagsInitial"],
stdout = subprocess.PIPE,
stderr = subprocess.PIPE).communicate()
if err:
diff -r 175b5c7ee4c7 -r 4b6ab0e5a0dd patches/zero/6914622.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6914622.patch Mon Jan 11 11:43:43 2010 +0000
@@ -0,0 +1,98 @@
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Thu Jan 07 16:24:17 2010 -0800
+@@ -2633,6 +2633,10 @@
+ if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
+ IgnoreUnrecognizedVMOptions = false;
+ }
++ if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
++ CommandLineFlags::printFlags();
++ vm_exit(0);
++ }
+ }
+
+ if (IgnoreUnrecognizedVMOptions) {
+@@ -2795,11 +2799,9 @@
+ CommandLineFlags::printSetFlags();
+ }
+
+-#ifdef ASSERT
+ if (PrintFlagsFinal) {
+ CommandLineFlags::printFlags();
+ }
+-#endif
+
+ return JNI_OK;
+ }
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/globals.cpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.cpp Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/globals.cpp Thu Jan 07 16:24:17 2010 -0800
+@@ -468,6 +468,8 @@
+ assert(Arguments::check_vm_args_consistency(), "Some flag settings conflict");
+ }
+
++#endif // PRODUCT
++
+ void CommandLineFlags::printFlags() {
+ // Print the flags sorted by name
+ // note: this method is called before the thread structure is in place
+@@ -493,5 +495,3 @@
+ }
+ FREE_C_HEAP_ARRAY(Flag*, array);
+ }
+-
+-#endif
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/globals.hpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.hpp Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp Thu Jan 07 16:24:17 2010 -0800
+@@ -211,7 +211,7 @@
+ static bool wasSetOnCmdline(const char* name, bool* value);
+ static void printSetFlags();
+
+- static void printFlags() PRODUCT_RETURN;
++ static void printFlags();
+
+ static void verify() PRODUCT_RETURN;
+ };
+@@ -327,9 +327,6 @@
+ product(bool, UseMembar, false, \
+ "(Unstable) Issues membars on thread state transitions") \
+ \
+- product(bool, PrintCommandLineFlags, false, \
+- "Prints flags that appeared on the command line") \
+- \
+ diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug, \
+ "Enable normal processing of flags relating to field diagnostics")\
+ \
+@@ -1967,9 +1964,6 @@
+ "number of times a GC thread (minus the coordinator) " \
+ "will sleep while yielding before giving up and resuming GC") \
+ \
+- notproduct(bool, PrintFlagsFinal, false, \
+- "Print all command line flags after argument processing") \
+- \
+ /* gc tracing */ \
+ manageable(bool, PrintGC, false, \
+ "Print message at garbage collect") \
+@@ -2269,11 +2263,20 @@
+ "If false, restricts profiled locations to the root method only") \
+ \
+ product(bool, PrintVMOptions, trueInDebug, \
+- "print VM flag settings") \
++ "Print flags that appeared on the command line") \
+ \
+ product(bool, IgnoreUnrecognizedVMOptions, false, \
+ "Ignore unrecognized VM options") \
+ \
++ product(bool, PrintCommandLineFlags, false, \
++ "Print flags specified on command line or set by ergonomics") \
++ \
++ product(bool, PrintFlagsInitial, false, \
++ "Print all VM flags before argument processing and exit VM") \
++ \
++ product(bool, PrintFlagsFinal, false, \
++ "Print all VM flags after argument and ergonomic processing") \
++ \
+ diagnostic(bool, SerializeVMOutput, true, \
+ "Use a mutex to serialize output to tty and hotspot.log") \
+ \
More information about the distro-pkg-dev
mailing list