spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LRU change

Browse Source
This commit is contained in:
mcrcortex
2025-04-07 14:51:50 +10:00
parent 7027c34941
commit 1dc6d2a6bf
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/me/cortex/voxy/common/world/ActiveSectionTracker.java
View File

@@ -20,8 +20,8 @@ public class ActiveSectionTracker {
private final ReentrantLock[] locks; private final ReentrantLock[] locks;
private final SectionLoader loader; private final SectionLoader loader;
private final int maxLRUSectionPerSlice; private final int lruSize;
private final Long2ObjectLinkedOpenHashMap<WorldSection>[] lruSecondaryCache;//TODO: THIS NEEDS TO BECOME A GLOBAL STATIC CACHE private final Long2ObjectLinkedOpenHashMap<WorldSection> lruSecondaryCache;//TODO: THIS NEEDS TO BECOME A GLOBAL STATIC CACHE
@Nullable @Nullable
public final WorldEngine engine; public final WorldEngine engine;
@@ -35,12 +35,11 @@ public class ActiveSectionTracker {
this.loader = loader; this.loader = loader;
this.loadedSectionCache = new Long2ObjectOpenHashMap[1<<numSlicesBits]; this.loadedSectionCache = new Long2ObjectOpenHashMap[1<<numSlicesBits];
this.lruSecondaryCache = new Long2ObjectLinkedOpenHashMap[1<<numSlicesBits]; this.lruSecondaryCache = new Long2ObjectLinkedOpenHashMap<>(cacheSize);
this.locks = new ReentrantLock[1<<numSlicesBits]; this.locks = new ReentrantLock[1<<numSlicesBits];
this.maxLRUSectionPerSlice = (cacheSize+(1<<numSlicesBits)-1)/(1<<numSlicesBits); this.lruSize = cacheSize;
for (int i = 0; i < this.loadedSectionCache.length; i++) { for (int i = 0; i < this.loadedSectionCache.length; i++) {
this.loadedSectionCache[i] = new Long2ObjectOpenHashMap<>(1024); this.loadedSectionCache[i] = new Long2ObjectOpenHashMap<>(1024);
this.lruSecondaryCache[i] = new Long2ObjectLinkedOpenHashMap<>(this.maxLRUSectionPerSlice);
this.locks[i] = new ReentrantLock(); this.locks[i] = new ReentrantLock();
} }
} }
@@ -71,12 +70,15 @@ public class ActiveSectionTracker {
lock.unlock(); lock.unlock();
return section; return section;
} }
if (isLoader) {
section = this.lruSecondaryCache[index].remove(key);
}
} }
lock.unlock(); lock.unlock();
if (isLoader) {
synchronized (this.lruSecondaryCache) {
section = this.lruSecondaryCache.remove(key);
}
}
//If this thread was the one to create the reference then its the thread to load the section //If this thread was the one to create the reference then its the thread to load the section
if (isLoader) { if (isLoader) {
int status = 0; int status = 0;
@@ -130,8 +132,7 @@ public class ActiveSectionTracker {
void tryUnload(WorldSection section) { void tryUnload(WorldSection section) {
int index = this.getCacheArrayIndex(section.key); int index = this.getCacheArrayIndex(section.key);
final var cache = this.loadedSectionCache[index]; final var cache = this.loadedSectionCache[index];
WorldSection prev = null; WorldSection sec = null;
WorldSection lruEntry = null;
final var lock = this.locks[index]; final var lock = this.locks[index];
lock.lock(); lock.lock();
{ {
@@ -141,23 +142,23 @@ public class ActiveSectionTracker {
if (obj != section) { if (obj != section) {
throw new IllegalStateException("Removed section not the same as the referenced section in the cache: cached: " + obj + " got: " + section + " A: " + WorldSection.ATOMIC_STATE_HANDLE.get(obj) + " B: " +WorldSection.ATOMIC_STATE_HANDLE.get(section)); throw new IllegalStateException("Removed section not the same as the referenced section in the cache: cached: " + obj + " got: " + section + " A: " + WorldSection.ATOMIC_STATE_HANDLE.get(obj) + " B: " +WorldSection.ATOMIC_STATE_HANDLE.get(section));
} }
sec = section;
//Add section to secondary cache while primary is locked
var lruCache = this.lruSecondaryCache[index];
prev = lruCache.put(section.key, section);
//If cache is bigger than its ment to be, remove the least recently used and free it
if (this.maxLRUSectionPerSlice < lruCache.size()) {
lruEntry = lruCache.removeFirst();
}
} }
} }
lock.unlock(); lock.unlock();
if (prev != null) { if (sec != null) {
prev._releaseArray(); WorldSection a;
} synchronized (this.lruSecondaryCache) {
if (lruEntry != null) { a = this.lruSecondaryCache.put(section.key, section);
lruEntry._releaseArray(); //If cache is bigger than its ment to be, remove the least recently used and free it
if (a == null && this.lruSize < this.lruSecondaryCache.size()) {
a = this.lruSecondaryCache.removeFirst();
}
}
if (a != null) {
a._releaseArray();
}
} }
} }
@@ -180,11 +181,7 @@ public class ActiveSectionTracker {
} }
public int getSecondaryCacheSize() { public int getSecondaryCacheSize() {
int res = 0; return this.lruSecondaryCache.size();
for (var cache : this.lruSecondaryCache) {
res += cache.size();
}
return res;
} }
public static void main(String[] args) { public static void main(String[] args) {