Skip to content

Stop the cloned section cache cleanup at the first entry that has not expired #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BonsUnleashed wants to merge 1 commit into
base: 20.1/forge
Choose a base branch
from
Open

Stop the cloned section cache cleanup at the first entry that has not expired #576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/main/java/me/jellysquid/mods/sodium/client/world/cloned/ClonedChunkSectionCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,15 @@ public ClonedChunkSectionCache(Level world) {

public synchronized void cleanup() {
this.time = getMonotonicTimeSource();
this.positionToEntry.values()
.removeIf(entry -> this.time > (entry.getLastUsedTimestamp() + MAX_CACHE_DURATION));

// The map is kept in order of last use, as acquire() moves each entry it returns to the end and stamps it with
// the current time. The expired entries are therefore always at the front, so stop at the first one which has
// not expired rather than checking every entry.
var iterator = this.positionToEntry.values().iterator();

while (iterator.hasNext() && this.time > (iterator.next().getLastUsedTimestamp() + MAX_CACHE_DURATION)) {
iterator.remove();
}
}

@Nullable
Expand Down
Loading