Mercurial > hg > release > icedtea7-forest-2.5 > hotspot

changeset 4845:7abbb274df31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Thu, 18 Jul 2013 14:14:30 -0400
parents c233f56b2e00 (current diff) 2afa14dcd667 (diff)
children f969880098fd
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java	Wed Jul 17 13:48:15 2013 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java	Thu Jul 18 14:14:30 2013 -0400
@@ -40,8 +40,8 @@
    }
 
    private static synchronized void initialize(TypeDataBase db) {
-      Type type = db.lookupType("BinaryTreeDictionary");
-      totalSizeField = type.getCIntegerField("_totalSize");
+      Type type = db.lookupType("BinaryTreeDictionary<FreeChunk>");
+      totalSizeField = type.getCIntegerField("_total_size");
    }
 
    // Fields
--- a/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java	Wed Jul 17 13:48:15 2013 +0200
+++ b/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java	Thu Jul 18 14:14:30 2013 -0400
@@ -41,7 +41,7 @@
    }
 
    private static synchronized void initialize(TypeDataBase db) {
-      Type type = db.lookupType("FreeList");
+      Type type = db.lookupType("FreeList<FreeChunk>");
       sizeField = type.getCIntegerField("_size");
       countField = type.getCIntegerField("_count");
       headerSize = type.getSize();