diff src/share/vm/utilities/globalDefinitions.hpp @ 17783:85b20fdf2d24

Merge
author kvn
date Tue, 25 Mar 2014 11:38:48 -0700
parents 606acabe7b5c
children 62c54fcc0a35
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions.hpp	Thu Mar 20 15:53:17 2014 +0100
+++ b/src/share/vm/utilities/globalDefinitions.hpp	Tue Mar 25 11:38:48 2014 -0700
@@ -370,6 +370,21 @@
 
 // Machine dependent stuff
 
+#if defined(X86) && defined(COMPILER2) && !defined(JAVASE_EMBEDDED)
+// Include Restricted Transactional Memory lock eliding optimization
+#define INCLUDE_RTM_OPT 1
+#define RTM_OPT_ONLY(code) code
+#else
+#define INCLUDE_RTM_OPT 0
+#define RTM_OPT_ONLY(code)
+#endif
+// States of Restricted Transactional Memory usage.
+enum RTMState {
+  NoRTM      = 0x2, // Don't use RTM
+  UseRTM     = 0x1, // Use RTM
+  ProfileRTM = 0x0  // Use RTM with abort ratio calculation
+};
+
 #ifdef TARGET_ARCH_x86
 # include "globalDefinitions_x86.hpp"
 #endif