From dd39e62d57ab0f2f2f6944bcb09fa30c06db3387 Mon Sep 17 00:00:00 2001
From: xlu <unknown>
Date: Sat, 22 Nov 2008 00:16:09 -0800
Subject: [PATCH] 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

---
 src/share/vm/runtime/arguments.cpp | 7 ++++++-
 src/share/vm/runtime/globals.hpp   | 5 +++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
index fa2ba2338..831218796 100644
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
@@ -2322,7 +2322,12 @@ SOLARIS_ONLY(
       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 --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp
index a2476f9c7..85689054e 100644
--- a/src/share/vm/runtime/globals.hpp
+++ b/src/share/vm/runtime/globals.hpp
@@ -3262,9 +3262,10 @@ class CommandLineFlags {
   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")
 
 
 /*
-- 
GitLab