mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Use ClassValue instead of LoadingCache 

This should be significantly faster than LoadingCache (2.5x in my
benchmarks, but not sure they're representative). This isn't super
important - a lookup only takes 6us - but still worth using!
This commit is contained in:
Jonathan Coates 2023-10-11 09:30:29 +01:00
parent 440fca6535
commit 7e5598d084
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
projects/core/src/main/java/dan200/computercraft/core/asm/MethodSupplierImpl.java
View File

@ -4,9 +4,6 @@
package dan200.computercraft.core.asm;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import dan200.computercraft.api.lua.LuaFunction;
import dan200.computercraft.api.lua.MethodResult;
import dan200.computercraft.api.peripheral.PeripheralType;
@ -23,7 +20,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import static dan200.computercraft.core.asm.Generator.catching;
@ -36,9 +32,14 @@ final class MethodSupplierImpl<T> implements MethodSupplier<T> {
private final IntCache<T> dynamic;
private final Function<Object, String[]> dynamicMethods;
private final LoadingCache<Class<?>, List<NamedMethod<T>>> classCache = CacheBuilder
.newBuilder()
.build(CacheLoader.from(catching(this::getMethodsImpl, List.of())));
private final ClassValue<List<NamedMethod<T>>> classCache = new ClassValue<>() {
private final Function<Class<?>, List<NamedMethod<T>>> getter = catching(MethodSupplierImpl.this::getMethodsImpl, List.of());
@Override
protected List<NamedMethod<T>> computeValue(Class<?> type) {
return getter.apply(type);
}
};
MethodSupplierImpl(
List<GenericMethod> genericMethods,
@ -93,12 +94,7 @@ public boolean forEachMethod(Object object, TargetedConsumer<T> consumer) {
@VisibleForTesting
List<NamedMethod<T>> getMethods(Class<?> klass) {
try {
return classCache.get(klass);
} catch (ExecutionException e) {
LOG.error("Error getting methods for {}.", klass.getName(), e.getCause());
return List.of();
}
return classCache.get(klass);
}
private List<NamedMethod<T>> getMethodsImpl(Class<?> klass) {
@ -148,5 +144,4 @@ private void addMethod(List<NamedMethod<T>> methods, Method method, LuaFunction
}
}
}
}