# HG changeset patch
# User xlu
# Date 1227341769 28800
# Node ID 171e581e816196a86424a0bcaaa60096c2daa527
# Parent  ba7f9d894282c06a60b00e846d43b7019f65d701
6554406: Change switch UseVMInterruptibleIO default to false (sol)
Summary: The default value of UseVMInterruptibleIO is changed to false for JDK 7, but the default isn't changed for JDK 6 and earlier.
Reviewed-by: never, acorn, dholmes, kamg, alanb

diff -r ba7f9d894282 -r 171e581e8161 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Fri Nov 21 15:10:14 2008 -0500
+++ b/src/share/vm/runtime/arguments.cpp	Sat Nov 22 00:16:09 2008 -0800
@@ -2322,7 +2322,12 @@
       return JNI_ERR;
     }
   }
-
+  // Change the default value for flags  which have different default values
+  // when working with older JDKs.
+  if (JDK_Version::current().compare_major(6) <= 0 &&
+      FLAG_IS_DEFAULT(UseVMInterruptibleIO)) {
+    FLAG_SET_DEFAULT(UseVMInterruptibleIO, true);
+  }
   return JNI_OK;
 }
 
diff -r ba7f9d894282 -r 171e581e8161 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Fri Nov 21 15:10:14 2008 -0500
+++ b/src/share/vm/runtime/globals.hpp	Sat Nov 22 00:16:09 2008 -0800
@@ -3262,9 +3262,10 @@
   diagnostic(bool, PrintDTraceDOF, false,                                   \
              "Print the DTrace DOF passed to the system for JSDT probes")   \
                                                                             \
-  product(bool, UseVMInterruptibleIO, true,                                 \
+  product(bool, UseVMInterruptibleIO, false,                                \
           "(Unstable, Solaris-specific) Thread interrupt before or with "   \
-          "EINTR for I/O operations results in OS_INTRPT")
+          "EINTR for I/O operations results in OS_INTRPT. The default value"\
+          " of this flag is true for JDK 6 and earliers")
 
 
 /*