Improve loading of classes in RunnerClassLoader

This ClassLoader is already parallel capable, so just mark it as such. Furthermore, we define the package without using the ClassLoader lock by utilizing getDefinedPackage and checking for duplicate definitions Co-authored-by: David M. Lloyd <david.lloyd@redhat.com>
Dairdevil · Apr 12, 2024 · 2710238 · 2710238
1 parent 047bb5e
commit 2710238
Showing 1 changed file with 48 additions and 29 deletions.
diff --git a/...rojects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java b/...rojects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/runner/RunnerClassLoader.java
@@ -26,6 +26,10 @@
  */
 public final class RunnerClassLoader extends ClassLoader {
 
+    static {
+        registerAsParallelCapable();
+    }
+
     /**
      * A map of resources by dir name. Root dir/default package is represented by the empty string
      */
@@ -101,18 +105,55 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce
                     continue;
                 }
                 definePackage(packageName, resources);
-                try {
-                    return defineClass(name, data, 0, data.length, resource.getProtectionDomain());
-                } catch (LinkageError e) {
-                    loaded = findLoadedClass(name);
-                    if (loaded != null) {
-                        return loaded;
+                return defineClass(name, data, resource);
+            }
+        }
+        return getParent().loadClass(name);
+    }
+
+    private void definePackage(String pkgName, ClassLoadingResource[] resources) {
+        if ((pkgName != null) && getDefinedPackage(pkgName) == null) {
+            for (ClassLoadingResource classPathElement : resources) {
+                ManifestInfo mf = classPathElement.getManifestInfo();
+                if (mf != null) {
+                    try {
+                        definePackage(pkgName, mf.getSpecTitle(),
+                                mf.getSpecVersion(),
+                                mf.getSpecVendor(),
+                                mf.getImplTitle(),
+                                mf.getImplVersion(),
+                                mf.getImplVendor(), null);
+                    } catch (IllegalArgumentException e) {
+                        var loaded = getDefinedPackage(pkgName);
+                        if (loaded == null) {
+                            throw e;
+                        }
                     }
+                    return;
+                }
+            }
+            try {
+                definePackage(pkgName, null, null, null, null, null, null, null);
+            } catch (IllegalArgumentException e) {
+                var loaded = getDefinedPackage(pkgName);
+                if (loaded == null) {
                     throw e;
                 }
             }
         }
-        return getParent().loadClass(name);
+    }
+
+    private Class<?> defineClass(String name, byte[] data, ClassLoadingResource resource) {
+        Class<?> loaded;
+        try {
+            return defineClass(name, data, 0, data.length, resource.getProtectionDomain());
+        } catch (LinkageError e) {
+            loaded = findLoadedClass(name);
+            if (loaded != null) {
+                return loaded;
+            }
+            throw e;
+        }
     }
 
     private void accessingResource(final ClassLoadingResource resource) {
@@ -219,28 +260,6 @@ protected Enumeration<URL> findResources(String name) {
         return Collections.enumeration(urls);
     }
 
-    private void definePackage(String pkgName, ClassLoadingResource[] resources) {
-        if ((pkgName != null) && getPackage(pkgName) == null) {
-            synchronized (getClassLoadingLock(pkgName)) {
-                if (getPackage(pkgName) == null) {
-                    for (ClassLoadingResource classPathElement : resources) {
-                        ManifestInfo mf = classPathElement.getManifestInfo();
-                        if (mf != null) {
-                            definePackage(pkgName, mf.getSpecTitle(),
-                                    mf.getSpecVersion(),
-                                    mf.getSpecVendor(),
-                                    mf.getImplTitle(),
-                                    mf.getImplVersion(),
-                                    mf.getImplVendor(), null);
-                            return;
-                        }
-                    }
-                    definePackage(pkgName, null, null, null, null, null, null, null);
-                }
-            }
-        }
-    }
-
     private String getPackageNameFromClassName(String className) {
         final int index = className.lastIndexOf('.');
         if (index == -1) {