TruffleObject.getTypeId() added to speedup TypesComputer.addObject()

Author: thurka

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObject.java

@@ -45,6 +45,7 @@ public abstract class TruffleObject {
 
     public abstract String getType(Heap heap);
 
+    public abstract long getTypeId(Heap heap);
 
     public static abstract class InstanceBased extends TruffleObject {
 

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleType.java

@@ -135,12 +135,14 @@ public static class TypesComputer<O extends TruffleObject, T extends TruffleType
 
         private final Heap heap;
         private final Map<String, T> cache;
+        private final Map<Long,String> typeCache;
 
 
         public TypesComputer(TruffleLanguage<O, T, ? extends TruffleLanguageHeapFragment<O, T>> language, Heap heap) {
             this.language = language;
             this.heap = heap;
             cache = new HashMap();
+            typeCache = new HashMap();
             retainedAvailable = DataType.RETAINED_SIZE.valuesAvailable(heap);
         }
 
@@ -152,7 +154,7 @@ public final void addObject(O object) {
             long objectSize = object.getSize();
             long objectRetainedSize = retainedAvailable ? object.getRetainedSize() :
                                       DataType.RETAINED_SIZE.getNotAvailableValue();
-            String typeName = object.getType(heap);
+            String typeName = getTypeName(object);
 
             addingObject(objectSize, objectRetainedSize, typeName);
 
@@ -168,7 +170,17 @@ public final void addObject(O object) {
         public final List<T> getTypes() {
             return Collections.unmodifiableList(new ArrayList(cache.values()));
         }
-                
+
+        private String getTypeName(O object) {
+            Long typeId = Long.valueOf(object.getTypeId(heap));
+            String typeName = typeCache.get(typeId);
+
+            if (typeName == null) {
+                typeName = object.getType(heap);
+                typeCache.put(typeId, typeName);
+            }
+            return typeName;
+        }
     }
 
 }

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/dynamicobject/DynamicObject.java

@@ -161,6 +161,11 @@ public String getType(Heap heap) {
         }
         return type;
     }
+
+    @Override
+    public long getTypeId(Heap heap) {
+        return getShape().getInstanceId();
+    }
 
     protected String computeType(Heap heap) {
         return DetailsSupport.getDetailsString(getShape(), heap);

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonObject.java

@@ -147,6 +147,11 @@ public String getType(Heap heap) {
         }
         return type;
     }
+
+    @Override
+    public long getTypeId(Heap heap) {
+        return pythonClass.getInstanceId();
+    }
 
     static String getPythonType(Instance instance) {
         return DetailsUtils.getInstanceString((Instance) instance.getValueOfField("pythonClass"), null); // NOI18N

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObject.java

@@ -231,6 +231,11 @@ public String getType(Heap heap) {
         if (type == null) type = getType(className);
         return type;
     }
+
+    @Override
+    public long getTypeId(Heap heap) {
+        return instance.getJavaClass().getJavaClassId();
+    }
 
     static String getRType(Instance instance) {
         return getType(instance.getJavaClass().getName());