GH-477 JavaClass.getSigners() and JavaClass.getProtectionDomain() implemented

Author: thurka

visualvm/heapviewer/nbproject/project.xml

@@ -29,7 +29,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.2</specification-version>
+                        <specification-version>1.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/ClassHierarchyPlugin.java

@@ -47,6 +47,7 @@
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.jfluid.heap.Instance;
 import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
+import org.graalvm.visualvm.lib.jfluid.heap.ObjectArrayInstance;
 import org.graalvm.visualvm.lib.profiler.api.icons.Icons;
 import org.graalvm.visualvm.lib.profiler.heapwalk.ui.icons.HeapWalkerIcons;
 import org.openide.util.NbBundle;
@@ -176,6 +177,8 @@ private static class FakeClass implements JavaClass {
         @Override public long getAllInstancesSize()                 { throw new UnsupportedOperationException("Not supported."); } // NOI18N
         @Override public boolean isArray()                          { throw new UnsupportedOperationException("Not supported."); } // NOI18N
         @Override public Instance getClassLoader()                  { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public ObjectArrayInstance getSigners()           { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public Instance getProtectionDomain()             { throw new UnsupportedOperationException("Not supported."); } // NOI18N
         @Override public List getFields()                           { throw new UnsupportedOperationException("Not supported."); } // NOI18N
         @Override public int getInstanceSize()                      { throw new UnsupportedOperationException("Not supported."); } // NOI18N
         @Override public List getInstances()                        { throw new UnsupportedOperationException("Not supported."); } // NOI18N

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaDiffClassesProvider.java

@@ -54,6 +54,7 @@
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.jfluid.heap.Instance;
 import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
+import org.graalvm.visualvm.lib.jfluid.heap.ObjectArrayInstance;
 import org.graalvm.visualvm.lib.profiler.api.icons.Icons;
 import org.graalvm.visualvm.lib.profiler.api.icons.LanguageIcons;
 import org.openide.util.lookup.ServiceProvider;
@@ -450,6 +451,16 @@ public Instance getClassLoader() {
             return null;
         }
 
+        @Override
+        public ObjectArrayInstance getSigners() {
+            return null;
+        }
+
+        @Override
+        public Instance getProtectionDomain() {
+            return null;
+        }
+
         @Override
         public List getFields() {
             return null;

visualvm/libs.profiler/lib.profiler.heap/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.jfluid.heap
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/heap/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.2
+OpenIDE-Module-Specification-Version: 1.3
 

visualvm/libs.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/ClassDump.java

@@ -109,6 +109,14 @@ public Instance getClassLoader() {
         return getHprof().getInstanceByID(getClassLoaderId());
     }
 
+    public ObjectArrayInstance getSigners() {
+        return (ObjectArrayInstance) getHprof().getInstanceByID(getSignersId());
+    }
+
+    public Instance getProtectionDomain() {
+        return getHprof().getInstanceByID(getProtectionDomainId());
+    }
+
     public Field getField(String name) {
         for (Field field : getFields()) {
             if (field.getName().equals(name)) {
@@ -407,6 +415,14 @@ long getClassLoaderId() {
         return getHprofBuffer().getID(fileOffset + classDumpSegment.classLoaderIDOffset);
     }
 
+    long getSignersId() {
+        return getHprofBuffer().getID(fileOffset + classDumpSegment.signersID);
+    }
+
+    long getProtectionDomainId() {
+        return getHprofBuffer().getID(fileOffset + classDumpSegment.protectionDomainIDOffset);
+    }
+
     List<Value> getReferences() {
         return getHprof().findReferencesFor(getJavaClassId());
     }

visualvm/libs.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/JavaClass.java

@@ -77,6 +77,24 @@ public interface JavaClass {
      */
     Instance getClassLoader();
 
+    /**
+     * returns {@link ObjectArrayInstance} representing the signers of this class.
+     * <br>
+     * Speed: fast
+     * @return the signers of this class, or null if there are no signers. In
+     *          particular, this method returns null if this object represents
+     *          a primitive type or void.
+     */
+    ObjectArrayInstance getSigners();
+
+    /**
+     * returns {@link Instance} representing protection domain of this class.
+     * <br>
+     * Speed: fast
+     * @return the ProtectionDomain of this class
+     */
+    Instance getProtectionDomain();
+
     /**
      * returns List of instance fields of this {@link JavaClass}.
      * <br>

visualvm/libs.profiler/profiler.oql/nbproject/project.xml

@@ -35,7 +35,7 @@ questions.
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>1.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/hat.js

@@ -439,8 +439,8 @@ function JavaClassWrapper(jclass) {
     }
 
     this.loader = wrapJavaObject(jclass.classLoader);
-    this.signers = undefined; //TODO wrapJavaValue(jclass.getSigners());
-    this.protectionDomain = undefined; //TODO wrapJavaValue(jclass.getProtectionDomain());
+    this.signers = wrapJavaValue(jclass.getSigners());
+    this.protectionDomain = wrapJavaValue(jclass.getProtectionDomain());
     Object.defineProperty(this, "fields", {
         get:function() { return wrapIterator(jclass.fields.iterator(), true); }
     });