Mercurial > hg > release > heapstats-1.1
changeset 6:548290ee3704
Bug 1600: Adapt to JDK-8015107
reviewed-by: ykubota
| author | Yasumasa Suenaga <suenaga.yasumasa@lab.ntt.co.jp> |
|---|---|
| date | Mon, 11 Nov 2013 17:59:15 +0900 |
| parents | 1242ca754c12 |
| children | edef0dd8472c |
| files | agent/ChangeLog agent/src/oopUtil.cpp |
| diffstat | 2 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/ChangeLog Mon Nov 11 16:41:58 2013 +0900 +++ b/agent/ChangeLog Mon Nov 11 17:59:15 2013 +0900 @@ -1,5 +1,6 @@ 2013-11-11 Yasumasa Suenaga <suenaga.yasumasa@lab.ntt.co.jp> + * Bug 1600: Adapt to JDK-8015107 * Bug 1599: Symbol name of vtable of ObjArrayKlass is incorrect. 2013-10-26 Yasumasa Suenaga <suenaga.yasumasa@lab.ntt.co.jp>
--- a/agent/src/oopUtil.cpp Mon Nov 11 16:41:58 2013 +0900 +++ b/agent/src/oopUtil.cpp Mon Nov 11 17:59:15 2013 +0900 @@ -1085,6 +1085,14 @@ */ bool enableCR8003424 = false; +/*! + * \brief Flag of JVM is applyed CR#8015107.<br> + * Decision for CR8015107: + * 8015107: NPG: Use consistent naming for metaspace concepts + * \sa https://bugs.openjdk.java.net/browse/JDK-8015107 + */ +bool enableCR8015107 = false; + /* Variable for hotspot version. */ /*! @@ -2257,13 +2265,16 @@ #ifdef __LP64__ if(enableCR6964458){ bool *tempPtr = NULL; + const char *target_sym = enableCR8015107 + ? "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; @@ -2273,10 +2284,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){ @@ -2831,6 +2842,13 @@ const unsigned int afterCR8003424 = 25 << 24 | 46; enableCR8003424 = (hotSpotVersion >= afterCR8003424); + /* + * See CR8015107: + * 8015107: NPG: Use consistent naming for metaspace concepts + */ + const unsigned int afterCR8015107 = 25 << 24 | 51; + enableCR8015107 = (hotSpotVersion >= afterCR8015107); + /* Search flag symbol in libjvm. */ searchCommonFlags();