diff src/share/vm/runtime/globals.hpp @ 7596:212c5b9c38e7

Merge
author dlong
date Thu, 17 Jan 2013 01:27:02 -0500
parents 9deda4d8e126 92d4b5d8dde4
children f422634e5828
line wrap: on
line diff
--- a/src/share/vm/runtime/globals.hpp	Mon Jan 14 13:52:08 2013 -0500
+++ b/src/share/vm/runtime/globals.hpp	Thu Jan 17 01:27:02 2013 -0500
@@ -1078,7 +1078,7 @@
                                                                             \
   product(intx, ClearFPUAtPark, 0, "(Unsafe,Unstable)" )                    \
                                                                             \
-  product(intx, hashCode, 0,                                                \
+  product(intx, hashCode, 5,                                                \
          "(Unstable) select hashCode generation algorithm" )                \
                                                                             \
   product(intx, WorkAroundNPTLTimedWaitHang, 1,                             \
@@ -1169,6 +1169,18 @@
   notproduct(bool, PrintCompactFieldsSavings, false,                        \
           "Print how many words were saved with CompactFields")             \
                                                                             \
+  notproduct(bool, PrintFieldLayout, false,                                 \
+          "Print field layout for each class")                              \
+                                                                            \
+  product(intx, ContendedPaddingWidth, 128,                                 \
+          "How many bytes to pad the fields/classes marked @Contended with")\
+                                                                            \
+  product(bool, EnableContended, true,                                      \
+          "Enable @Contended annotation support")                           \
+                                                                            \
+  product(bool, RestrictContended, true,                                    \
+          "Restrict @Contended to trusted classes")                         \
+                                                                            \
   product(bool, UseBiasedLocking, true,                                     \
           "Enable biased locking in JVM")                                   \
                                                                             \