make ClassLoaderTable.parentLoaderIds[] instance variable

Author: thurka

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassFileCache.java

@@ -171,7 +171,7 @@ int hasVMSuppliedClassFile(String name, int classLoaderId) {
             if (res) {
                 return classLoaderId;
             } else if (classLoaderId != 0) {
-                classLoaderId = ClassLoaderTable.getParentLoader(classLoaderId);
+                classLoaderId = classPath.getClassLoaderTable().getParentLoader(classLoaderId);
             }
 
             if (classLoaderId == -1) {

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassLoaderTable.java

@@ -37,7 +37,7 @@ public class ClassLoaderTable {
 
     // TODO [release]: change value to TRUE to remove the print code below entirely by compiler
     private static final boolean DEBUG = System.getProperty("org.graalvm.visualvm.lib.jfluid.classfile.ClassLoaderTable") != null; // NOI18N
-    private static int[] parentLoaderIds;
+    private int[] parentLoaderIds;
 
     //~ Methods ------------------------------------------------------------------------------------------------------------------
 
@@ -48,7 +48,7 @@ public class ClassLoaderTable {
      * @param loader id of ClassLoader whose parent we are looking for
      * @return The id of the parent classloader of the specified classloader
      */
-    public static int getParentLoader(int loader) {
+    public int getParentLoader(int loader) {
         if (DEBUG) {
             System.err.println("ClassLoaderTable.DEBUG: getParent loader: " + loader); // NOI18N
         }
@@ -66,7 +66,7 @@ public static int getParentLoader(int loader) {
     /**
      * @param thisAndParentLoaderData An array
      */
-    public static void addChildAndParent(int[] thisAndParentLoaderData) {
+    public void addChildAndParent(int[] thisAndParentLoaderData) {
         int ofs = thisAndParentLoaderData[2];
 
         if (ofs == 0) {
@@ -88,7 +88,7 @@ public static void addChildAndParent(int[] thisAndParentLoaderData) {
      *
      * @param inParentLoaderIds table mapping id (idx) -> parent id ([idx])
      */
-    public static void initTable(int[] inParentLoaderIds) {
+    public void initTable(int[] inParentLoaderIds) {
         if (DEBUG) {
             System.err.println("ClassLoaderTable.DEBUG: init patent loader ids: " + inParentLoaderIds.length); // NOI18N
 
@@ -114,7 +114,7 @@ public static void initTable(int[] inParentLoaderIds) {
      * @param childLoader  Id of classloader
      * @param parentLoader Id of its parent classloader
      */
-    private static void addChildAndParent(int childLoader, int parentLoader) {
+    private void addChildAndParent(int childLoader, int parentLoader) {
         if (DEBUG) {
             System.err.println("ClassLoaderTable.DEBUG: add child and parent: child: " // NOI18N
                                + childLoader + ", parent: " // NOI18N

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassPath.java

@@ -170,6 +170,7 @@ protected boolean removeEldestEntry(Map.Entry eldest) {
     //~ Instance fields ----------------------------------------------------------------------------------------------------------
 
     private ClassFileCache classCache;
+    private ClassLoaderTable loaderTable;
     private JarLRUCache zipFileNameToFile;
     private PathEntry[] paths;
     private boolean isCP; // True for a class path, false for a source path
@@ -199,6 +200,7 @@ public ClassPath(String classPath, boolean isCP) {
 
         paths = (PathEntry[])vec.toArray(new PathEntry[0]);
         classCache = new ClassFileCache(this);
+        loaderTable = new ClassLoaderTable();
     }
 
     //~ Methods ------------------------------------------------------------------------------------------------------------------
@@ -261,6 +263,10 @@ void preloadBytecode(String name, String classFileLocation) {
         classCache.preloadBytecode(name, classFileLocation);
     }
 
+    public ClassLoaderTable getClassLoaderTable() {
+        return loaderTable;
+    }
+
     public void close() {
         // close all ZipFiles in ClassPath, the files on disk would otherwise be locked
         // this is a bugfix for http://profiler.netbeans.org/issues/show_bug.cgi?id=61849

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/ClassRepository.java

@@ -731,7 +731,7 @@ private DynamicClassInfo tryLoadRealClass(String className, int classLoaderId, b
             }
 
             // Try parent loader - in some cases a class can be initially requested with the loader of its subclass
-            loader = ClassLoaderTable.getParentLoader(loader);
+            loader = classPath.getClassLoaderTable().getParentLoader(loader);
         } while (loader >= 0);
 
         if (clazz == null) {

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/classfile/SameNameClassGroup.java

@@ -62,14 +62,15 @@ public void add(BaseClassInfo clazz) {
      * loader classLoaderId will return this class if asked for the class with this name.
      */
     public static BaseClassInfo checkForCompatibility(ClassRepository repo, BaseClassInfo clazz, int classLoaderId) {
+        ClassLoaderTable table = repo.getClassPath().getClassLoaderTable();
         int entryLoader = clazz.getLoaderId();
 
         if (entryLoader == classLoaderId) {
             return clazz;
         } else {
-            if (isParentLoaderTo(entryLoader, classLoaderId)) {
+            if (isParentLoaderTo(table, entryLoader, classLoaderId)) {
                 return clazz;
-            } else if (clazz instanceof PlaceholderClassInfo && isParentLoaderTo(classLoaderId, entryLoader)) { // This can happen at least with placeholders
+            } else if (clazz instanceof PlaceholderClassInfo && isParentLoaderTo(table, classLoaderId, entryLoader)) { // This can happen at least with placeholders
                 clazz.setLoaderId(classLoaderId);
 
                 return clazz;
@@ -118,14 +119,14 @@ public void replace(BaseClassInfo clazz1, BaseClassInfo clazz2) {
         classes.add(clazz2);
     }
 
-    private static boolean isParentLoaderTo(int testParentLoader, int testChildLoader) {
-        int parent = ClassLoaderTable.getParentLoader(testChildLoader);
+    private static boolean isParentLoaderTo(ClassLoaderTable table, int testParentLoader, int testChildLoader) {
+        int parent = table.getParentLoader(testChildLoader);
 
         while (parent != testParentLoader) {
             if (parent == 0) {
                 return false;
             } else {
-                parent = ClassLoaderTable.getParentLoader(parent);
+                parent = table.getParentLoader(parent);
             }
         }
 

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/Instrumentor.java

@@ -30,7 +30,6 @@
 import java.util.List;
 import org.graalvm.visualvm.lib.jfluid.ProfilerEngineSettings;
 import org.graalvm.visualvm.lib.jfluid.classfile.BaseClassInfo;
-import org.graalvm.visualvm.lib.jfluid.classfile.ClassLoaderTable;
 import org.graalvm.visualvm.lib.jfluid.classfile.ClassRepository;
 import org.graalvm.visualvm.lib.jfluid.client.ClientUtils.SourceCodeSelection;
 import org.graalvm.visualvm.lib.jfluid.client.RuntimeProfilingPoint;
@@ -233,7 +232,7 @@ public synchronized InstrumentMethodGroupResponse createFollowUpInstrumentMethod
                 classRepo.addVMSuppliedClassFile(clcmd.getClassName().replace('.','/'), thisAndParentLoaderData[0], classFileBytes);
             }
 
-            ClassLoaderTable.addChildAndParent(thisAndParentLoaderData);
+            classRepo.getClassPath().getClassLoaderTable().addChildAndParent(thisAndParentLoaderData);
         } else if (cmd instanceof MethodLoadedCommand) {
             MethodLoadedCommand mcmd = (MethodLoadedCommand) cmd;
 
@@ -282,7 +281,7 @@ public synchronized InstrumentMethodGroupResponse createFollowUpInstrumentMethod
 
     public synchronized InstrumentMethodGroupResponse createInitialInstrumentMethodGroupResponse(RootClassLoadedCommand cmd)
         throws ClassNotFoundException, BadLocationException {
-        ClassLoaderTable.initTable(cmd.getParentLoaderIds());
+        classRepo.getClassPath().getClassLoaderTable().initTable(cmd.getParentLoaderIds());
 
         InstrumentMethodGroupResponse imgr = null;