NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "Optimize iteration in reference chunk loader"
Shiroha CI / build (push) Canceled after 0s
Details
Shiroha CI / Event File (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
NanaChiyo0721
2026-08-22 23:20:22 +08:00
parent 6f7ba53119
commit 6fdd8eee4a
1 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shiroha-server/src/main/java/io/nanachiyo0721/shiroha/utils/ReferenceCountingChunkLoader.java
+5 -16
View File
@@ -218,23 +218,11 @@ public class ReferenceCountingChunkLoader {
final ReferenceCountData[] toRemoveTicket = new ReferenceCountData[1]; final ReferenceCountData[] toRemoveTicket = new ReferenceCountData[1];
final it.unimi.dsi.fastutil.longs.LongIterator sectionsIterator = currentRegion.getOwnedSectionsUnsynchronised(); for (ConcurrentChainedLong2ReferenceHashTable.TableEntry<ReferenceCountData> counterEntry : this.referenceCounters.entrySet()) {
while (sectionsIterator.hasNext()) { final long coord = counterEntry.getKey();
final long sectionKey = sectionsIterator.nextLong(); final ReferenceCountData counterData = counterEntry.getValue();
final int sectionX = CoordinateUtils.getChunkX(sectionKey);
final int sectionZ = CoordinateUtils.getChunkZ(sectionKey);
final int chunkX = sectionX << this.world.regioniser.sectionChunkShift; if (currentRegion == this.world.regioniser.getRegionAtUnsynchronised(CoordinateUtils.getChunkX(coord), CoordinateUtils.getChunkZ(coord))) {
final int chunkZ = sectionZ << this.world.regioniser.sectionChunkShift;
final long coord = CoordinateUtils.getChunkKey(chunkX, chunkZ);
final ReferenceCountData counterData = this.referenceCounters.get(coord);
// removed
if (counterData == null) {
continue;
}
// do ttl
long curr = counterData.referenceTTL.get(); long curr = counterData.referenceTTL.get();
if (curr == (curr = counterData.referenceTTL.compareAndExchange(curr, curr - 1))) { if (curr == (curr = counterData.referenceTTL.compareAndExchange(curr, curr - 1))) {
if (counterData.referenceCount.get() != 0L) { if (counterData.referenceCount.get() != 0L) {
@@ -262,6 +250,7 @@ public class ReferenceCountingChunkLoader {
} }
} }
} }
}
private static final class ReferenceCountData { private static final class ReferenceCountData {