mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2025-07-01 15:37:24 +00:00
Fix Cache Deadlock
This commit is contained in:
parent
1e5a1e20c2
commit
65d026a130
@ -24,24 +24,28 @@ public class CacheSampler implements NoiseSampler {
|
||||
public CacheSampler(NoiseSampler sampler, int dimensions) {
|
||||
this.sampler = sampler;
|
||||
if (dimensions == 2) {
|
||||
LoadingCache<DoubleSeededVector2Key, Double> cache = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(256)
|
||||
.maximumSize(256)
|
||||
.build(this::sampleNoise);
|
||||
this.cache2D = ThreadLocal.withInitial(() -> Pair.of(new DoubleSeededVector2Key(0, 0, 0), cache).mutable());
|
||||
this.cache2D = ThreadLocal.withInitial(() -> {
|
||||
LoadingCache<DoubleSeededVector2Key, Double> cache = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(256)
|
||||
.maximumSize(256)
|
||||
.build(this::sampleNoise);
|
||||
return Pair.of(new DoubleSeededVector2Key(0, 0, 0), cache).mutable();
|
||||
});
|
||||
this.cache3D = null;
|
||||
} else {
|
||||
LoadingCache<DoubleSeededVector3Key, Double> cache = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(981504)
|
||||
.maximumSize(981504)
|
||||
.build(this::sampleNoise);
|
||||
this.cache3D = ThreadLocal.withInitial(() -> Pair.of(new DoubleSeededVector3Key(0, 0, 0, 0), cache).mutable());
|
||||
this.cache3D = ThreadLocal.withInitial(() -> {
|
||||
LoadingCache<DoubleSeededVector3Key, Double> cache = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(981504)
|
||||
.maximumSize(981504)
|
||||
.build(this::sampleNoise);
|
||||
return Pair.of(new DoubleSeededVector3Key(0, 0, 0, 0), cache).mutable();
|
||||
});
|
||||
this.cache2D = null;
|
||||
}
|
||||
}
|
||||
|
@ -33,23 +33,27 @@ public class CachingBiomeProvider implements BiomeProvider, Handle {
|
||||
this.delegate = delegate;
|
||||
this.res = delegate.resolution();
|
||||
|
||||
LoadingCache<SeededVector2Key, Optional<Biome>> cache = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(256)
|
||||
.maximumSize(256)
|
||||
.build(this::sampleBiome);
|
||||
this.baseCache = ThreadLocal.withInitial(() -> Pair.of(new SeededVector2Key(0, 0, 0), cache).mutable());
|
||||
this.baseCache = ThreadLocal.withInitial(() -> {
|
||||
LoadingCache<SeededVector2Key, Optional<Biome>> cache = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(256)
|
||||
.maximumSize(256)
|
||||
.build(this::sampleBiome);
|
||||
return Pair.of(new SeededVector2Key(0, 0, 0), cache).mutable();
|
||||
});
|
||||
|
||||
LoadingCache<SeededVector3Key, Biome> cache3D = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(981504)
|
||||
.maximumSize(981504)
|
||||
.build(this::sampleBiome);
|
||||
this.cache = ThreadLocal.withInitial(() -> Pair.of(new SeededVector3Key(0, 0, 0, 0), cache3D).mutable());
|
||||
this.cache = ThreadLocal.withInitial(() -> {
|
||||
LoadingCache<SeededVector3Key, Biome> cache3D = Caffeine
|
||||
.newBuilder()
|
||||
.executor(CACHE_EXECUTOR)
|
||||
.scheduler(Scheduler.systemScheduler())
|
||||
.initialCapacity(981504)
|
||||
.maximumSize(981504)
|
||||
.build(this::sampleBiome);
|
||||
return Pair.of(new SeededVector3Key(0, 0, 0, 0), cache3D).mutable();
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user