src/share/vm/utilities/globalDefinitions.hpp

@@ -148,12 +148,18 @@
 // log2_intptr(sizeof(class JavaThread)) - log2_intptr(64);
 // see os::set_memory_serialize_page()
 #ifdef _LP64
 const int SerializePageShiftCount = 4;
 #else
+#if INCLUDE_JFR && INCLUDE_ALL_GCS
+// JavaThread already has quite a few Shenandoah fields. Adding many JFR fields
+// trips sizeof(JavaThread) > 1024. Need to adjust it here.
+const int SerializePageShiftCount = 4;
+#else
 const int SerializePageShiftCount = 3;
 #endif
+#endif
 
 // An opaque struct of heap-word width, so that HeapWord* can be a generic
 // pointer into the heap.  We require that object sizes be measured in
 // units of heap words, so that that
 //   HeapWord* hw;

@@ -1430,10 +1436,11 @@
 #define INT64_FORMAT           "%" PRId64
 #define UINT64_FORMAT          "%" PRIu64
 #define UINT64_FORMAT_X        "%" PRIx64
 #define INT64_FORMAT_W(width)  "%" #width PRId64
 #define UINT64_FORMAT_W(width) "%" #width PRIu64
+#define UINT64_FORMAT_X_W(width) "%" #width PRIx64
 
 #define PTR64_FORMAT           "0x%016" PRIx64
 
 // Format jlong, if necessary
 #ifndef JLONG_FORMAT