phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve multithreading performance: do not lock on classloader.

Browse Source
This commit is contained in:
Frits Jalvingh
2016-06-25 17:59:42 +02:00
parent 5c6cd5cbed
commit 46ad3a4700
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/typeresolution/PMDASMClassLoader.java
View File

@@ -10,6 +10,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassReader;
@@ -35,7 +36,11 @@ public final class PMDASMClassLoader extends ClassLoader {
private static ClassLoader cachedClassLoader; private static ClassLoader cachedClassLoader;
/** Caches the names of the classes that we can't load or that don't exist. */ /** Caches the names of the classes that we can't load or that don't exist. */
private final Set<String> dontBother = new HashSet<>(); private final ConcurrentHashMap<String, Boolean> m_dontBotherSet = new ConcurrentHashMap<>();
static {
registerAsParallelCapable();
}
private PMDASMClassLoader(ClassLoader parent) { private PMDASMClassLoader(ClassLoader parent) {
super(parent); super(parent);
@@ -56,17 +61,17 @@ public final class PMDASMClassLoader extends ClassLoader {
} }
@Override @Override
public synchronized Class<?> loadClass(String name) throws ClassNotFoundException { public Class<?> loadClass(String name) throws ClassNotFoundException {
if (dontBother.contains(name)) { if(m_dontBotherSet.containsKey(name))
throw new ClassNotFoundException(name); throw new ClassNotFoundException(name);
}
try { try {
return super.loadClass(name); return super.loadClass(name);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
dontBother.add(name); m_dontBotherSet.put(name, Boolean.TRUE);
throw e; throw e;
} catch (NoClassDefFoundError e) { } catch (NoClassDefFoundError e) {
dontBother.add(name); m_dontBotherSet.put(name, Boolean.TRUE);
// rethrow as ClassNotFoundException, as the remaining part just // rethrow as ClassNotFoundException, as the remaining part just
// deals with that // deals with that
// see also: https://sourceforge.net/p/pmd/bugs/1319/ // see also: https://sourceforge.net/p/pmd/bugs/1319/
@@ -75,8 +80,7 @@ public final class PMDASMClassLoader extends ClassLoader {
} }
public synchronized Map<String, String> getImportedClasses(String name) throws ClassNotFoundException { public synchronized Map<String, String> getImportedClasses(String name) throws ClassNotFoundException {
if (m_dontBotherSet.contains(name)) {
if (dontBother.contains(name)) {
throw new ClassNotFoundException(name); throw new ClassNotFoundException(name);
} }
try { try {
@@ -98,7 +102,7 @@ public final class PMDASMClassLoader extends ClassLoader {
} }
return asmVisitor.getPackages(); return asmVisitor.getPackages();
} catch (IOException e) { } catch (IOException e) {
dontBother.add(name); m_dontBotherSet.put(name, Boolean.TRUE);
throw new ClassNotFoundException(name, e); throw new ClassNotFoundException(name, e);
} }
} }