singleton ClassFileCache.getDefault() removed

Author: thurka

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

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.jfluid/2
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.13
+OpenIDE-Module-Specification-Version: 2.14
 

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/ProfilerClient.java

@@ -410,6 +410,7 @@ public void run() {
     private int currentAgentId = -1;
     private long instrProcessingTime;
     private long resultsStart;
+    private ClassRepository classRepo;
 
     //~ Constructors -------------------------------------------------------------------------------------------------------------
 
@@ -420,7 +421,8 @@ public ProfilerClient(ProfilerEngineSettings settings, ProfilingSessionStatus st
         this.status = status;
         appStatusHandler = ash;
         serverCommandHandler = sch;
-        instrumentor = new Instrumentor(status, settings);
+        classRepo = new ClassRepository();
+        instrumentor = new Instrumentor(classRepo, status, settings);
         histogramManager = new HeapHistogramManager(settings);
         EventBufferProcessor.initialize(this);
         EventBufferResultsProvider.getDefault().addDispatcher(ProfilingResultsDispatcher.getDefault());
@@ -531,6 +533,10 @@ public int getCurrentInstrType() {
         return status.currentInstrType;
     }
 
+    public ClassRepository getClassRepository() {
+        return classRepo;
+    }
+
     public JMethodIdTable getJMethodIdTable() {
         synchronized (methodIdsTableLock) {
             if (methodIdsTable == null) {
@@ -1557,7 +1563,7 @@ private boolean setVMProperties(VMPropertiesResponse resp, boolean terminateOnEr
             settings.setWorkingDir("");
             settings.setVMClassPaths("", null, null);
         }
-        ClassRepository.initClassPaths(settings.getWorkingDir(), settings.getVMClassPaths());
+        classRepo.initClassPaths(settings.getWorkingDir(), settings.getVMClassPaths());
 
         return true;
     }

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

@@ -49,11 +49,7 @@
  *
  * @author Misha Dmitirev
  */
-public class ClassFileCache {
-    //~ Static fields/initializers -----------------------------------------------------------------------------------------------
-
-    private static ClassFileCache defaultClassFileCache;
-
+class ClassFileCache {
     //~ Instance fields ----------------------------------------------------------------------------------------------------------
 
     private ClassPath classPath; // Used to quickly obtain an open JAR file for a given name
@@ -71,7 +67,7 @@ public class ClassFileCache {
     //~ Constructors -------------------------------------------------------------------------------------------------------------
 
     //------------ We don't expect the below API to be used outside of this package, hence it's package-private ------------
-    ClassFileCache() {
+    ClassFileCache(ClassPath cp) {
         capacity = 877; // FIXME: may be worth setting size flexibly, or adjusting inside cache if too many evictions happen
         size = 0;
         sizeLimit = (capacity * 3) / 4;
@@ -82,22 +78,11 @@ public class ClassFileCache {
         vmSuppliedClassCache = new HashMap();
         preloadNames = new ArrayList();
         preloadLoaderIds = new ArrayList();
+        classPath = cp;
     }
 
     //~ Methods ------------------------------------------------------------------------------------------------------------------
 
-    static ClassFileCache getDefault() {
-        if (defaultClassFileCache == null) {
-            defaultClassFileCache = new ClassFileCache();
-        }
-
-        return defaultClassFileCache;
-    }
-
-    static void resetDefaultCache() {
-        defaultClassFileCache = null;
-    }
-
     byte[] getClassFile(String name, String location) throws IOException {
         String nameAndLocation = (name + "#" + location).intern(); // NOI18N
         byte[] res;
@@ -246,10 +231,6 @@ private byte[] readClassFile(String name, String classFileLocation)
 
             ZipFile zip = null;
 
-            if (classPath == null) {
-                classPath = ClassRepository.getClassPath();
-            }
-
             if (classPath != null) {
                 try {
                     zip = classPath.getZipFileForName(classFileLocation);

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

@@ -169,6 +169,7 @@ protected boolean removeEldestEntry(Map.Entry eldest) {
 
     //~ Instance fields ----------------------------------------------------------------------------------------------------------
 
+    private ClassFileCache classCache;
     private JarLRUCache zipFileNameToFile;
     private PathEntry[] paths;
     private boolean isCP; // True for a class path, false for a source path
@@ -197,6 +198,7 @@ public ClassPath(String classPath, boolean isCP) {
         }
 
         paths = (PathEntry[])vec.toArray(new PathEntry[0]);
+        classCache = new ClassFileCache(this);
     }
 
     //~ Methods ------------------------------------------------------------------------------------------------------------------
@@ -217,7 +219,7 @@ public DynamicClassInfo getClassInfoForClass(String className, int classLoaderId
             return null;
         }
 
-        return new DynamicClassInfo(slashedClassName, classLoaderId, dirOrJar);
+        return new DynamicClassInfo(this, slashedClassName, classLoaderId, dirOrJar);
     }
 
     /** Requires "slashed" class name. Returns the directory or .jar name where this class is located, or null if not found. */
@@ -243,6 +245,22 @@ public ZipFile getZipFileForName(String zipFileName) throws IOException {
         return zip;
     }
 
+    void addVMSuppliedClassFile(String className, int classLoaderId, byte[] buf) {
+        classCache.addVMSuppliedClassFile(className, classLoaderId, buf);
+    }
+
+    int hasVMSuppliedClassFile(String className, int classLoaderId) {
+        return classCache.hasVMSuppliedClassFile(className, classLoaderId);
+    }
+
+    byte[] getClassFile(String name, String classFileLocation) throws IOException {
+        return classCache.getClassFile(name, classFileLocation);
+    }
+
+    void preloadBytecode(String name, String classFileLocation) {
+        classCache.preloadBytecode(name, classFileLocation);
+    }
+
     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