mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test paper deadlock fix

Browse Source
This commit is contained in:
Daniel Mills 2021-07-07 19:22:36 -04:00
parent 2fde7b7879
commit 3be4b08bb0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java
View File

@ -4,18 +4,21 @@ import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
import com.volmit.iris.scaffold.cache.Cache; import com.volmit.iris.scaffold.cache.Cache;
import com.volmit.iris.scaffold.stream.BasicStream; import com.volmit.iris.scaffold.stream.BasicStream;
import com.volmit.iris.scaffold.stream.ProceduralStream; import com.volmit.iris.scaffold.stream.ProceduralStream;
import com.volmit.iris.util.ChronoLatch;
import java.util.concurrent.Semaphore;
// TODO BETTER CACHE SOLUTION
public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStream<T> public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStream<T>
{ {
private final ProceduralStream<T> stream; private final ProceduralStream<T> stream;
private final ConcurrentLinkedHashMap<Long, T> cache; private final ConcurrentLinkedHashMap<Long, T> cache;
private ChronoLatch cl = new ChronoLatch(1000); private final Semaphore locker;
public CachedStream2D(ProceduralStream<T> stream, int size) public CachedStream2D(ProceduralStream<T> stream, int size)
{ {
super(); super();
this.stream = stream; this.stream = stream;
locker = new Semaphore(30);
cache = new ConcurrentLinkedHashMap.Builder<Long, T>() cache = new ConcurrentLinkedHashMap.Builder<Long, T>()
.initialCapacity(size) .initialCapacity(size)
.maximumWeightedCapacity(size) .maximumWeightedCapacity(size)
@ -38,8 +41,15 @@ public class CachedStream2D<T> extends BasicStream<T> implements ProceduralStrea
@Override @Override
public T get(double x, double z) public T get(double x, double z)
{ {
try {
locker.acquire();
} catch (InterruptedException e) {
e.printStackTrace();
}
long ck = Cache.key((int) x, (int) z); long ck = Cache.key((int) x, (int) z);
return cache.compute(ck, (k, v) -> v != null ? v : stream.get(Cache.keyX(ck), Cache.keyZ(ck))); T f = cache.compute(ck, (k, v) -> v != null ? v : stream.get(Cache.keyX(ck), Cache.keyZ(ck)));
locker.release();
return f;
} }
@Override @Override