DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Use nested caches for enormous placements instead of weak hash map

Browse Source 
Should recycle memory better
This commit is contained in:
DBotThePony 2025-03-09 13:34:47 +07:00
parent cc456958e1
commit 44b0bcd776
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EnormousPlacement.kt
View File

@ -66,12 +66,15 @@ class EnormousPlacement(
} }
} }
private val level2cache = WeakHashMap<WorldGenLevel, Cache<ChunkPos, GeneratedChunk>>() private val level2cache = Caffeine.newBuilder()
private val lock = ReentrantLock() .scheduler(Scheduler.systemScheduler())
.executor(Util.backgroundExecutor())
.expireAfterAccess(Duration.ofMinutes(10))
.weakKeys()
.build<WorldGenLevel, Cache<ChunkPos, GeneratedChunk>>()
private fun getCache(level: WorldGenLevel): Cache<ChunkPos, GeneratedChunk> { private fun getCache(level: WorldGenLevel): Cache<ChunkPos, GeneratedChunk> {
return lock.withLock { return level2cache.get(level) {
level2cache.computeIfAbsent(level) {
Caffeine.newBuilder() Caffeine.newBuilder()
.scheduler(Scheduler.systemScheduler()) .scheduler(Scheduler.systemScheduler())
.executor(Util.backgroundExecutor()) .executor(Util.backgroundExecutor())
@ -81,7 +84,6 @@ class EnormousPlacement(
.build() .build()
} }
} }
}
private fun computeChunk(context: PlacementContext, pos: ChunkPos): GeneratedChunk { private fun computeChunk(context: PlacementContext, pos: ChunkPos): GeneratedChunk {
val bytes = FastByteArrayOutputStream() val bytes = FastByteArrayOutputStream()