# HG changeset patch
# User Yasumasa Suenaga <suenaga.yasumasa@lab.ntt.co.jp>
# Date 1384160560 -32400
# Node ID fa4bbeb769a38b74911a89cc886c4d1c1615ddf1
# Parent  e20b4494bc92c2264fe06da8a23d4895cca4534a
Bug 1600: Adapt to JDK-8015107
reviewed-by: ykubota

diff -r e20b4494bc92 -r fa4bbeb769a3 agent/ChangeLog
--- a/agent/ChangeLog	Mon Oct 07 22:03:14 2013 +0900
+++ b/agent/ChangeLog	Mon Nov 11 18:02:40 2013 +0900
@@ -1,3 +1,7 @@
+2013-11-11  Yasumasa Suenaga  <suenaga.yasumasa@lab.ntt.co.jp>
+
+	* Bug 1600: Adapt to JDK-8015107
+
 2013-10-07  Yasumasa Suenaga  <suenaga.yasumasa@lab.ntt.co.jp>
 
 	* Bug 1568: Crash on Java8 EA 
diff -r e20b4494bc92 -r fa4bbeb769a3 agent/src/jvmInfo.hpp
--- a/agent/src/jvmInfo.hpp	Mon Oct 07 22:03:14 2013 +0900
+++ b/agent/src/jvmInfo.hpp	Mon Nov 11 18:02:40 2013 +0900
@@ -404,6 +404,15 @@
     }
 
     /*!
+     * \brief Decision for 8015107: NPG: Use consistent naming for metaspace concepts
+     * https://bugs.openjdk.java.net/browse/JDK-8015107
+     */
+    inline bool isAfterCR8015107(void){
+      // hs25.0-b51
+      return (this->_hsVersion >= MAKE_HS_VERSION(25, 0, 51));
+    }
+
+    /*!
      * \brief Get JVM name.
      * \return JVM name.
      */
diff -r e20b4494bc92 -r fa4bbeb769a3 agent/src/oopUtil.cpp
--- a/agent/src/oopUtil.cpp	Mon Oct 07 22:03:14 2013 +0900
+++ b/agent/src/oopUtil.cpp	Mon Nov 11 18:02:40 2013 +0900
@@ -1674,13 +1674,16 @@
 #ifdef __LP64__
   if(jvmInfo->isAfterCR6964458()){
     bool *tempPtr = NULL;
+    const char *target_sym = jvmInfo->isAfterCR8015107()
+                                     ? "UseCompressedClassPointers"
+                                     : "UseCompressedKlassPointers";
     
     /* Search symbol. */
-    tempPtr = (bool*)symFinder->findSymbol("UseCompressedKlassPointers");
+    tempPtr = (bool*)symFinder->findSymbol(target_sym);
     
     /* If not found symbol. */
     if (unlikely(tempPtr == NULL)) {
-      PRINT_WARN_MSG("UseCompressedKlassPointers not found.");
+      PRINT_WARN_MSG_HEADER << target_sym << " not found." << NEWLINE;
     }
     else{
       isCOOP = tempPtr;
@@ -1690,10 +1693,10 @@
 #endif
 
   if(*isCOOP){
-    PRINT_DEBUG_MSG("Compressed Klass = true");
+    PRINT_DEBUG_MSG("Compressed Class = true");
   }
   else{
-    PRINT_DEBUG_MSG("Compressed Klass = false");
+    PRINT_DEBUG_MSG("Compressed Class = false");
   }
 
   if(*useG1){