Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

review: fix: Use thread-local caching for actual class lookup #4671

Merged
merged 4 commits into from
Apr 11, 2022
Merged

review: fix: Use thread-local caching for actual class lookup #4671

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d19ae0d
Use thread-local caching for actual class lookup
slarse Apr 10, 2022
aa611e6
Fix raw type warning
slarse Apr 10, 2022
dd7d5b2
Extract cache handling to separate method
slarse Apr 10, 2022
c443ace
Fix order of modifiers
slarse Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/main/java/spoon/support/reflect/reference/CtTypeReferenceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.ReentrantLock;
import static spoon.reflect.ModelElementContainerDefaultCapacities.TYPE_TYPE_PARAMETERS_CONTAINER_DEFAULT_CAPACITY;
import static spoon.reflect.path.CtRole.DECLARING_TYPE;
import static spoon.reflect.path.CtRole.IS_SHADOW;
Expand All @@ -54,9 +53,11 @@

public class CtTypeReferenceImpl<T> extends CtReferenceImpl implements CtTypeReference<T> {
private static final long serialVersionUID = 1L;
private static Map<String, Class> classByQName = new ConcurrentHashMap<>();
private static ClassLoader lastClassLoader = null;
private final ReentrantLock lock = new ReentrantLock();

// We use thread-local storage for the caching to avoid having to lock when doing cache invalidation and lookup.
// See https://github.com/INRIA/spoon/issues/4668 for details.
private static final ThreadLocal<Map<String, Class<?>>> classByQName = ThreadLocal.withInitial(HashMap::new);
private static final ThreadLocal<ClassLoader> lastClassLoader = new ThreadLocal<>();

@MetamodelPropertyField(role = TYPE_ARGUMENT)
List<CtTypeReference<?>> actualTypeArguments = CtElementImpl.emptyList();
Expand Down Expand Up @@ -150,7 +151,6 @@ private Optional<Class<T>> getPrimitiveType(CtTypeReference<?> typeReference) {
*
* Looks for the class in the standard Java classpath, but also in the sourceClassPath given as option.
*/
@SuppressWarnings("unchecked")
protected Class<T> findClass() {
CtTypeReference<?> typeReference = this;
if (isArray()) {
Expand All @@ -160,13 +160,16 @@ protected Class<T> findClass() {
}
typeReference = componentTypeReference;
}
Class<T> actualClass = getClassFromThreadLocalCacheOrLoad(typeReference);
return isArray() ? arrayType(actualClass) : actualClass;
}

@SuppressWarnings("unchecked")
private Class<T> getClassFromThreadLocalCacheOrLoad(CtTypeReference<?> typeReference) {
ClassLoader classLoader = getFactory().getEnvironment().getInputClassLoader();
lock.lock();
checkCacheIntegrity(classLoader);
String qualifiedName = typeReference.getQualifiedName();
Class<T> clazz = classByQName.computeIfAbsent(qualifiedName, key -> loadClassWithQName(classLoader, qualifiedName));
lock.unlock();
return isArray() ? arrayType(clazz) : clazz;
return (Class<T>) classByQName.get().computeIfAbsent(qualifiedName, key -> loadClassWithQName(classLoader, qualifiedName));
}

/**
Expand Down Expand Up @@ -194,10 +197,10 @@ private Class<?> loadClassWithQName(ClassLoader classLoader, String qualifiedNam
* @param classLoader the classloader to check against the old one.
*/
private void checkCacheIntegrity(ClassLoader classLoader) {
if (classLoader != lastClassLoader) {
if (classLoader != lastClassLoader.get()) {
//clear cache because class loader changed
classByQName.clear();
lastClassLoader = classLoader;
classByQName.get().clear();
lastClassLoader.set(classLoader);
}
}

Expand Down