diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 171e90833..232826f21 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -254,15 +254,6 @@ public class Iris extends VolmitPlugin implements Listener { configWatcher.checkModified(); Iris.info("Hotloaded settings.json"); } - - int ev = CachedStream2D.evictions.get(); - if(IrisSettings.get().getGeneral().isDebug()) - { - Iris.debug("Cache Hit Ratio: " + C.RED + Form.pc((double)CachedStream2D.cacheHits.get()/ (double)(CachedStream2D.cacheMisses.get() + CachedStream2D.cacheHits.get()), 2) + " " + C.LIGHT_PURPLE + " Evictions: " + C.AQUA + Form.f(ev/2) + "/s" + C.LIGHT_PURPLE + " Cache Size: " + C.RED + Form.f(CachedStream2D.cacheMisses.get() - CachedStream2D.evictions.get())); - CachedStream2D.cacheMisses.addAndGet(-CachedStream2D.evictions.get()); - CachedStream2D.cacheHits.addAndGet(-CachedStream2D.evictions.get()); - CachedStream2D.evictions.set(0); - } } public void onDisable() { diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java index f1f8c1daf..0bd11d9d1 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java @@ -29,9 +29,6 @@ import java.util.concurrent.atomic.AtomicInteger; public class CachedStream2D extends BasicStream implements ProceduralStream { private final ProceduralStream stream; private final ConcurrentLinkedHashMap cache; - public static final AtomicInteger cacheHits = new AtomicInteger(); - public static final AtomicInteger cacheMisses = new AtomicInteger(); - public static final AtomicInteger evictions = new AtomicInteger(); public CachedStream2D(ProceduralStream stream, int size) { super(); @@ -40,7 +37,6 @@ public class CachedStream2D extends BasicStream implements ProceduralStrea .initialCapacity(size) .maximumWeightedCapacity(size) .concurrencyLevel(32) - .listener((k, v) -> evictions.incrementAndGet()) .build(); } @@ -61,16 +57,7 @@ public class CachedStream2D extends BasicStream implements ProceduralStrea return stream.get((int) x, (int) z); } - return cache.compute(Cache.key((int) x, (int) z), (k, v) -> { - if(v != null ) - { - cacheHits.incrementAndGet(); - return v; - } - - cacheMisses.incrementAndGet(); - return stream.get((int) x, (int) z); - }); + return cache.compute(Cache.key((int) x, (int) z), (k, v) -> v != null ? v : stream.get((int) x, (int) z)); } @Override