Skip to content

Avoid unnecessary rehash in ChunkLevelManager and TicketDistanceLevelPropagator #488

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
InitAuther97 wants to merge 4 commits into
base: dev/1.21.11
Choose a base branch
from
Open

Avoid unnecessary rehash in ChunkLevelManager and TicketDistanceLevelPropagator #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c19e4e1
Avoid unnecessary rehash in TicketDistanceLevelPropagator
InitAuther97 Dec 11, 2025
b3fe1d4
Avoid unnecessary rehash in TicketDistanceLevelPropagator
InitAuther97 Dec 11, 2025
aaf7d89
Avoid unnecessary rehash in TicketDistanceLevelPropagator
InitAuther97 Dec 11, 2025
2d2186e
Revert to use fastIterator
InitAuther97 Dec 12, 2025
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: 7 additions & 4 deletions ...tem/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinChunkLevelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap;
import it.unimi.dsi.fastutil.longs.Long2IntMap;
import it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator;
import net.minecraft.server.world.ChunkHolder;
import net.minecraft.server.world.ChunkLevelManager;
import net.minecraft.server.world.ServerChunkLoadingManager;
Expand Down Expand Up @@ -78,11 +80,12 @@ private ThrottledChunkTaskScheduler syncPlayerTickets(TaskExecutor<Runnable> exe
private void postTicketPropagator(ServerChunkLoadingManager chunkLoadingManager, CallbackInfoReturnable<Boolean> cir) {
if (this.ticketDistanceLevelPropagator != null) { // ignore if replaced
Long2IntLinkedOpenHashMap updates = ((TicketDistanceLevelPropagatorExtension) this.ticketDistanceLevelPropagator).c2me$getTicketLevelUpdates();
while (!updates.isEmpty()) {
long pos = updates.firstLongKey();
int level = updates.removeFirstInt();
this.setLevel(pos, level, null, Integer.MAX_VALUE - 1); // holder and old level is ignored
ObjectBidirectionalIterator<Long2IntMap.Entry> iterator = updates.long2IntEntrySet().fastIterator();
while (iterator.hasNext()) {
Long2IntMap.Entry entry = iterator.next();
this.setLevel(entry.getLongKey(), entry.getIntValue(), null, Integer.MAX_VALUE - 1); // holder and old level is ignored
}
updates.clear();
}
}

Expand Down
10 changes: 9 additions & 1 deletion ...c2me/rewrites/chunksystem/mixin/MixinChunkTicketManagerTicketDistanceLevelPropagator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@ public class MixinChunkTicketManagerTicketDistanceLevelPropagator implements Tic
private void postInit(CallbackInfo ci) {
this.c2me$levels = new Long2IntOpenHashMap();
this.c2me$levels.defaultReturnValue(UNLOADED + 1);
this.c2me$ticketLevelUpdates = new Long2IntLinkedOpenHashMap();
this.c2me$ticketLevelUpdates = new Long2IntLinkedOpenHashMap() {
@Override
protected void rehash(int newN) {
if (newN <= n) {
return; // prevent shrinking
}
super.rehash(newN);
}
};
}

/**
Expand Down