Misterzym
/
KCauldron-minecraft-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Focus on array O(1) access for chunks

master
Robotia 9 years ago
parent
6caa8497f6
commit
86e921d606
4 changed files with 171 additions and 135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 53
      patches/net/minecraft/world/WorldServer.java.patch
  2. 215
      patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
  3. 12
      patches/net/minecraftforge/common/chunkio/ChunkIOProvider.java.patch
  4. 4
      src/main/java/org/bukkit/craftbukkit/CraftWorld.java

53
patches/net/minecraft/world/WorldServer.java.patch
Unescape View File

@ -278,10 +278,10 @@
+ if (entityplayer.isPlayerFullyAsleep()) + if (entityplayer.isPlayerFullyAsleep())
+ { + {
+ foundActualSleepers = true; + foundActualSleepers = true;
+ }
} }
- while (entityplayer.isPlayerFullyAsleep()); - while (entityplayer.isPlayerFullyAsleep());
- -
+ }
+ while (entityplayer.isPlayerFullyAsleep() || entityplayer.fauxSleeping); + while (entityplayer.isPlayerFullyAsleep() || entityplayer.fauxSleeping);
+ // CraftBukkit end + // CraftBukkit end
return false; return false;
@ -297,17 +297,17 @@
- while (iterator.hasNext()) - while (iterator.hasNext())
+ // Spigot start + // Spigot start
+ for (gnu.trove.iterator.TLongShortIterator iter = activeChunkSet_CB.iterator(); iter.hasNext();) + for (gnu.trove.iterator.TLongShortIterator iter = activeChunkSet_CB.iterator(); iter.hasNext();)
{ + {
- ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair)iterator.next();
- int k = chunkcoordintpair.chunkXPos * 16;
- int l = chunkcoordintpair.chunkZPos * 16;
+ iter.advance(); + iter.advance();
+ long chunkCoord = iter.key(); + long chunkCoord = iter.key();
+ int chunkX = World.keyToX(chunkCoord); + int chunkX = World.keyToX(chunkCoord);
+ int chunkZ = World.keyToZ(chunkCoord); + int chunkZ = World.keyToZ(chunkCoord);
+ // If unloaded, or in process of being unloaded, drop it + // If unloaded, or in process of being unloaded, drop it
+ if ((!this.chunkExists(chunkX, chunkZ)) || (this.theChunkProviderServer.chunksToUnload.contains(chunkX, chunkZ))) + if ((!this.chunkExists(chunkX, chunkZ)) || (this.theChunkProviderServer.chunksToUnload.contains(chunkX, chunkZ)))
+ { {
- ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair)iterator.next();
- int k = chunkcoordintpair.chunkXPos * 16;
- int l = chunkcoordintpair.chunkZPos * 16;
+ activeChunkSet.remove(new ChunkCoordIntPair(chunkX, chunkZ)); // Cauldron - vanilla compatibility + activeChunkSet.remove(new ChunkCoordIntPair(chunkX, chunkZ)); // Cauldron - vanilla compatibility
+ iter.remove(); + iter.remove();
+ continue; + continue;
@ -397,11 +397,19 @@
} }
public void resetUpdateEntityTick() public void resetUpdateEntityTick()
@@ -506,7 +687,16 @@ @@ -498,7 +679,7 @@
{
int i = this.pendingTickListEntriesTreeSet.size();
- if (i != this.pendingTickListEntriesHashSet.size())
+ if (false)//i != this.pendingTickListEntriesHashSet.size())
{
throw new IllegalStateException("TickNextTick list out of synch");
}
@@ -506,8 +687,17 @@
{ {
if (i > 1000) if (i > 1000)
{ {
- i = 1000;
+ // CraftBukkit start - If the server has too much to process over time, try to alleviate that + // CraftBukkit start - If the server has too much to process over time, try to alleviate that
+ if (i > 20 * 1000) + if (i > 20 * 1000)
+ { + {
@ -409,17 +417,17 @@
+ } + }
+ else + else
+ { + {
+ i = 1000; i = 1000;
+ }
+ // CraftBukkit end
} }
+ // CraftBukkit end
+ }
this.theProfiler.startSection("cleaning"); this.theProfiler.startSection("cleaning");
NextTickListEntry nextticklistentry;
@@ -651,7 +841,37 @@ @@ -651,7 +841,37 @@
protected IChunkProvider createChunkProvider() protected IChunkProvider createChunkProvider()
{ {
IChunkLoader ichunkloader = this.saveHandler.getChunkLoader(this.provider); IChunkLoader ichunkloader = this.saveHandler.getChunkLoader(this.provider);
- this.theChunkProviderServer = new ChunkProviderServer(this, ichunkloader, this.provider.createChunkGenerator());
+ // Cauldron start - if provider is vanilla, proceed to create a bukkit compatible chunk generator + // Cauldron start - if provider is vanilla, proceed to create a bukkit compatible chunk generator
+ if (this.provider.getClass().toString().length() <= 3 || this.provider.getClass().toString().contains("net.minecraft")) + if (this.provider.getClass().toString().length() <= 3 || this.provider.getClass().toString().contains("net.minecraft"))
+ { + {
@ -448,7 +456,7 @@
+ else + else
+ // custom provider, load normally for forge compatibility + // custom provider, load normally for forge compatibility
+ { + {
+ this.theChunkProviderServer = new ChunkProviderServer(this, ichunkloader, this.provider.createChunkGenerator()); this.theChunkProviderServer = new ChunkProviderServer(this, ichunkloader, this.provider.createChunkGenerator());
+ } + }
+ // Cauldron end + // Cauldron end
return this.theChunkProviderServer; return this.theChunkProviderServer;
@ -467,35 +475,34 @@
{ {
- Chunk chunk = getChunkFromChunkCoords(x, z); - Chunk chunk = getChunkFromChunkCoords(x, z);
- if (chunk != null) - if (chunk != null)
- {
- for(Object obj : chunk.chunkTileEntityMap.values())
+ Chunk chunk = getChunkFromChunkCoords(chunkX, chunkZ); + Chunk chunk = getChunkFromChunkCoords(chunkX, chunkZ);
+ +
+ if (chunk == null) + if (chunk == null)
{ {
- for(Object obj : chunk.chunkTileEntityMap.values()) - TileEntity entity = (TileEntity)obj;
- if (!entity.isInvalid())
+ continue; + continue;
+ } + }
+ +
+ for (Object te : chunk.chunkTileEntityMap.values()) + for (Object te : chunk.chunkTileEntityMap.values())
+ { {
- if (entity.xCoord >= p_147486_1_ && entity.yCoord >= p_147486_2_ && entity.zCoord >= p_147486_3_ &&
- entity.xCoord <= p_147486_4_ && entity.yCoord <= p_147486_5_ && entity.zCoord <= p_147486_6_)
+ TileEntity tileentity = (TileEntity) te; + TileEntity tileentity = (TileEntity) te;
+ +
+ if ((tileentity.xCoord >= p_147486_1_) && (tileentity.yCoord >= p_147486_2_) && (tileentity.zCoord >= p_147486_3_) + if ((tileentity.xCoord >= p_147486_1_) && (tileentity.yCoord >= p_147486_2_) && (tileentity.zCoord >= p_147486_3_)
+ && (tileentity.xCoord < p_147486_4_) && (tileentity.yCoord < p_147486_5_) && (tileentity.zCoord < p_147486_6_)) + && (tileentity.xCoord < p_147486_4_) && (tileentity.yCoord < p_147486_5_) && (tileentity.zCoord < p_147486_6_))
{ {
- TileEntity entity = (TileEntity)obj;
- if (!entity.isInvalid())
- {
- if (entity.xCoord >= p_147486_1_ && entity.yCoord >= p_147486_2_ && entity.zCoord >= p_147486_3_ &&
- entity.xCoord <= p_147486_4_ && entity.yCoord <= p_147486_5_ && entity.zCoord <= p_147486_6_)
- {
- arraylist.add(entity); - arraylist.add(entity);
- }
- }
+ arraylist.add(tileentity); + arraylist.add(tileentity);
} }
} }
} }
} }
- }
- }
- -
+ // CraftBukkit end + // CraftBukkit end
return arraylist; return arraylist;

215
patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
Unescape View File

@ -15,7 +15,6 @@
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -9,6 +15,7 @@ @@ -9,6 +15,7 @@
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -24,7 +23,6 @@
import net.minecraft.crash.CrashReportCategory; import net.minecraft.crash.CrashReportCategory;
import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.EnumCreatureType;
@@ -33,22 +40,54 @@ @@ -33,22 +40,54 @@
import net.minecraftforge.common.chunkio.ChunkIOExecutor;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -70,7 +68,7 @@
+ public boolean loadChunkOnProvideRequest = MinecraftServer.getServer().cauldronConfig.loadChunkOnRequest.getValue(); // Cauldron - if true, allows mods to force load chunks. to disable, set load-chunk-on-request in cauldron.yml to false + public boolean loadChunkOnProvideRequest = MinecraftServer.getServer().cauldronConfig.loadChunkOnRequest.getValue(); // Cauldron - if true, allows mods to force load chunks. to disable, set load-chunk-on-request in cauldron.yml to false
+ public int initialTick; // Cauldron counter to keep track of when this loader was created + public int initialTick; // Cauldron counter to keep track of when this loader was created
+ public TLongObjectMap<Chunk> loadedChunkHashMap_KC = new TSynchronizedLongObjectMap<Chunk>(new TLongObjectHashMap<Chunk>()); + public TLongObjectMap<Chunk> loadedChunkHashMap_KC = new TSynchronizedLongObjectMap<Chunk>(new TLongObjectHashMap<Chunk>());
+ public ConcurrentHashMap<Integer,Chunk> chunkt_KC = new ConcurrentHashMap<Integer,Chunk>(); //KCauldron IntMap + public ConcurrentHashMap<Integer,Chunk[][]> chunkt_KC = new ConcurrentHashMap<Integer,Chunk[][]>(); //KCauldron IntMap
+ public ConcurrentHashMap<Integer,Chunk> cachet_KC = new ConcurrentHashMap<Integer,Chunk>(); //Fixed 500 chunk access cache + public ConcurrentHashMap<Integer,Chunk> cachet_KC = new ConcurrentHashMap<Integer,Chunk>(); //Fixed 500 chunk access cache
+ public List loadedChunks = new ArrayList(); // Cauldron - vanilla compatibility + public List loadedChunks = new ArrayList(); // Cauldron - vanilla compatibility
public WorldServer worldObj; public WorldServer worldObj;
@ -85,12 +83,11 @@
this.worldObj = p_i1520_1_; this.worldObj = p_i1520_1_;
this.currentChunkLoader = p_i1520_2_; this.currentChunkLoader = p_i1520_2_;
@@ -57,16 +96,22 @@ @@ -57,16 +96,22 @@
public class ChunkProviderServer implements IChunkProvider
public boolean chunkExists(int p_73149_1_, int p_73149_2_) public boolean chunkExists(int p_73149_1_, int p_73149_2_)
{ {
- return this.loadedChunkHashMap.containsItem(ChunkCoordIntPair.chunkXZ2Int(p_73149_1_, p_73149_2_)); - return this.loadedChunkHashMap.containsItem(ChunkCoordIntPair.chunkXZ2Int(p_73149_1_, p_73149_2_));
+ return this.chunkt_KC.containsKey(chunk_hash(p_73149_1_, p_73149_2_)); //KCauldron Replacement + return chunk_get(p_73149_1_, p_73149_2_) != null; //KCauldron Replacement
} }
- public List func_152380_a() - public List func_152380_a()
@ -102,7 +99,7 @@
public void unloadChunksIfNotNearSpawn(int p_73241_1_, int p_73241_2_) public void unloadChunksIfNotNearSpawn(int p_73241_1_, int p_73241_2_)
{ {
+ // PaperSpigot start - Asynchronous lighting updates + // PaperSpigot start - Asynchronous lighting updates
+ Chunk chunk = this.chunkt_KC.get(chunk_hash(p_73241_1_, p_73241_2_)); //KCauldron replacement + Chunk chunk = chunk_get(p_73241_1_, p_73241_2_); //KCauldron replacement
+ if (chunk != null && chunk.worldObj.spigotConfig.useAsyncLighting && (chunk.pendingLightUpdates.get() > 0 || chunk.worldObj.getTotalWorldTime() - chunk.lightUpdateTime < 20)) { + if (chunk != null && chunk.worldObj.spigotConfig.useAsyncLighting && (chunk.pendingLightUpdates.get() > 0 || chunk.worldObj.getTotalWorldTime() - chunk.lightUpdateTime < 20)) {
+ return; + return;
+ } + }
@ -111,7 +108,6 @@
{ {
ChunkCoordinates chunkcoordinates = this.worldObj.getSpawnPoint(); ChunkCoordinates chunkcoordinates = this.worldObj.getSpawnPoint();
@@ -74,26 +119,68 @@ @@ -74,26 +119,68 @@
public class ChunkProviderServer implements IChunkProvider
int l = p_73241_2_ * 16 + 8 - chunkcoordinates.posZ; int l = p_73241_2_ * 16 + 8 - chunkcoordinates.posZ;
short short1 = 128; short short1 = 128;
@ -120,14 +116,14 @@
{ {
- this.chunksToUnload.add(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_73241_1_, p_73241_2_))); - this.chunksToUnload.add(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_73241_1_, p_73241_2_)));
+ this.chunksToUnload.add(p_73241_1_, p_73241_2_); + this.chunksToUnload.add(p_73241_1_, p_73241_2_);
+ Chunk c = this.chunkt_KC.get(chunk_hash(p_73241_1_, p_73241_2_)); //KCauldron replacement + Chunk c = (chunk_get(p_73241_1_, p_73241_2_)); //KCauldron replacement
+ +
+ if (c != null) + if (c != null)
+ { + {
+ c.mustSave = true; + c.mustSave = true;
+ }
+ CauldronHooks.logChunkUnload(this, p_73241_1_, p_73241_2_, "Chunk added to unload queue");
} }
+ CauldronHooks.logChunkUnload(this, p_73241_1_, p_73241_2_, "Chunk added to unload queue");
+ }
+ +
+ // CraftBukkit end + // CraftBukkit end
} }
@ -136,7 +132,7 @@
- this.chunksToUnload.add(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_73241_1_, p_73241_2_))); - this.chunksToUnload.add(Long.valueOf(ChunkCoordIntPair.chunkXZ2Int(p_73241_1_, p_73241_2_)));
+ // CraftBukkit start + // CraftBukkit start
+ this.chunksToUnload.add(p_73241_1_, p_73241_2_); + this.chunksToUnload.add(p_73241_1_, p_73241_2_);
+ Chunk c = this.chunkt_KC.get(chunk_hash(p_73241_1_, p_73241_2_)); //KCauldron replacement + Chunk c = (chunk_get(p_73241_1_, p_73241_2_)); //KCauldron replacement
+ +
+ if (c != null) + if (c != null)
+ { + {
@ -167,27 +163,26 @@
+ if(chunk == null || !chunk.isChunkLoaded) + if(chunk == null || !chunk.isChunkLoaded)
+ { + {
+ if(chunk != null) + if(chunk != null)
+ { {
- Chunk chunk = (Chunk)iterator.next();
- this.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
+ cachet_KC.remove(hash); + cachet_KC.remove(hash);
+ } }
+ chunk = (Chunk) chunkt_KC.get(hash); + chunk = (Chunk) chunk_get(x, z);
+ if(chunk != null) + if(chunk != null)
+ { + {
+ cachet_KC.put(hash,chunk); + cachet_KC.put(hash,chunk);
+ } + }
+ } + }
+ if(cachet_KC.size() > 500) + if(cachet_KC.size() > 500)
{ + {
- Chunk chunk = (Chunk)iterator.next();
- this.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
+ cachet_KC.clear(); + cachet_KC.clear();
} + }
+ return chunk; + return chunk;
} }
public Chunk loadChunk(int p_73158_1_, int p_73158_2_) public Chunk loadChunk(int p_73158_1_, int p_73158_2_)
@@ -103,9 +190,9 @@ @@ -103,9 +190,9 @@
public class ChunkProviderServer implements IChunkProvider
public Chunk loadChunk(int par1, int par2, Runnable runnable) public Chunk loadChunk(int par1, int par2, Runnable runnable)
{ {
@ -195,13 +190,12 @@
- this.chunksToUnload.remove(Long.valueOf(k)); - this.chunksToUnload.remove(Long.valueOf(k));
- Chunk chunk = (Chunk)this.loadedChunkHashMap.getValueByKey(k); - Chunk chunk = (Chunk)this.loadedChunkHashMap.getValueByKey(k);
+ this.chunksToUnload.remove(par1, par2); + this.chunksToUnload.remove(par1, par2);
+ Chunk chunk = (Chunk) this.chunkt_KC.get(chunk_hash(par1,par2)); //KCauldron replacement + Chunk chunk = (Chunk) chunk_get(par1,par2); //KCauldron replacement
+ boolean newChunk = false; + boolean newChunk = false;
AnvilChunkLoader loader = null; AnvilChunkLoader loader = null;
if (this.currentChunkLoader instanceof AnvilChunkLoader) if (this.currentChunkLoader instanceof AnvilChunkLoader)
@@ -113,6 +200,8 @@ @@ -113,6 +200,8 @@
public class ChunkProviderServer implements IChunkProvider
loader = (AnvilChunkLoader) this.currentChunkLoader; loader = (AnvilChunkLoader) this.currentChunkLoader;
} }
@ -211,7 +205,6 @@
if (chunk == null && loader != null && loader.chunkExists(this.worldObj, par1, par2)) if (chunk == null && loader != null && loader.chunkExists(this.worldObj, par1, par2))
{ {
@@ -142,18 +231,19 @@ @@ -142,18 +231,19 @@
public class ChunkProviderServer implements IChunkProvider
public Chunk originalLoadChunk(int p_73158_1_, int p_73158_2_) public Chunk originalLoadChunk(int p_73158_1_, int p_73158_2_)
{ {
@ -219,7 +212,7 @@
- this.chunksToUnload.remove(Long.valueOf(k)); - this.chunksToUnload.remove(Long.valueOf(k));
- Chunk chunk = (Chunk)this.loadedChunkHashMap.getValueByKey(k); - Chunk chunk = (Chunk)this.loadedChunkHashMap.getValueByKey(k);
+ this.chunksToUnload.remove(p_73158_1_, p_73158_2_); + this.chunksToUnload.remove(p_73158_1_, p_73158_2_);
+ Chunk chunk = (Chunk) this.chunkt_KC.get(chunk_hash(p_73158_1_, p_73158_2_)); //KCauldron replacement + Chunk chunk = chunk_get(p_73158_1_, p_73158_2_); //KCauldron replacement
+ boolean newChunk = false; // CraftBukkit + boolean newChunk = false; // CraftBukkit
if (chunk == null) if (chunk == null)
@ -236,8 +229,7 @@
if (chunk == null) if (chunk == null)
{ {
chunk = this.safeLoadChunk(p_73158_1_, p_73158_2_); chunk = this.safeLoadChunk(p_73158_1_, p_73158_2_);
@@ -176,18 +266,53 @@ @@ -176,18 +266,64 @@
public class ChunkProviderServer implements IChunkProvider
CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Exception generating new chunk"); CrashReport crashreport = CrashReport.makeCrashReport(throwable, "Exception generating new chunk");
CrashReportCategory crashreportcategory = crashreport.makeCategory("Chunk to be generated"); CrashReportCategory crashreportcategory = crashreport.makeCategory("Chunk to be generated");
crashreportcategory.addCrashSection("Location", String.format("%d,%d", new Object[] {Integer.valueOf(p_73158_1_), Integer.valueOf(p_73158_2_)})); crashreportcategory.addCrashSection("Location", String.format("%d,%d", new Object[] {Integer.valueOf(p_73158_1_), Integer.valueOf(p_73158_2_)}));
@ -249,15 +241,29 @@
} }
+ +
+ newChunk = true; // CraftBukkit + newChunk = true; // CraftBukkit
}
- this.loadedChunkHashMap.add(k, chunk);
- this.loadedChunks.add(chunk);
- loadingChunks.remove(k);
+ this.loadedChunkHashMap_KC.put(LongHash.toLong(p_73158_1_, p_73158_2_), chunk);
+ Chunk[][] temp_chunk_bunch = chunk_array_get(p_73158_1_, p_73158_2_);
+ if(temp_chunk_bunch != null)
+ {
+ temp_chunk_bunch[chunk_array(p_73158_1_)][chunk_array(p_73158_2_)] = chunk;
+ }
+ else
+ {
+ temp_chunk_bunch = new Chunk[16][16];
+ temp_chunk_bunch[chunk_array(p_73158_1_)][chunk_array(p_73158_2_)] = chunk;
+ this.chunkt_KC.put(chunk_hash(p_73158_1_ >> 4, p_73158_2_ >> 4), temp_chunk_bunch); //KCauldron - IntHash
+ } + }
+
+ this.loadedChunkHashMap_KC.put(LongHash.toLong(p_73158_1_, p_73158_2_), chunk); this.chunkt_KC.put(chunk_hash(p_73158_1_, p_73158_2_), chunk); //KCauldron - IntHash
+ this.loadedChunks.add(chunk); // Cauldron - vanilla compatibility + this.loadedChunks.add(chunk); // Cauldron - vanilla compatibility
+ loadingChunks.remove(LongHash.toLong(p_73158_1_, p_73158_2_)); // Cauldron - LongHash + loadingChunks.remove(LongHash.toLong(p_73158_1_, p_73158_2_)); // Cauldron - LongHash
+ +
+ if (chunk != null) + if (chunk != null)
+ { + {
+ chunk.onChunkLoad(); chunk.onChunkLoad();
+ } + }
+ // CraftBukkit start + // CraftBukkit start
+ Server server = this.worldObj.getServer(); + Server server = this.worldObj.getServer();
@ -270,12 +276,8 @@
+ * no way of creating a CraftWorld/CraftServer at that point. + * no way of creating a CraftWorld/CraftServer at that point.
+ */ + */
+ server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(chunk.bukkitChunk, newChunk)); + server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(chunk.bukkitChunk, newChunk));
} + }
+
- this.loadedChunkHashMap.add(k, chunk);
- this.loadedChunks.add(chunk);
- loadingChunks.remove(k);
- chunk.onChunkLoad();
+ // Update neighbor counts + // Update neighbor counts
+ for (int x = -2; x < 3; x++) { + for (int x = -2; x < 3; x++) {
+ for (int z = -2; z < 3; z++) { + for (int z = -2; z < 3; z++) {
@ -296,8 +298,7 @@
} }
return chunk; return chunk;
@@ -195,11 +320,48 @@ @@ -195,11 +331,48 @@
public class ChunkProviderServer implements IChunkProvider
public Chunk provideChunk(int p_73154_1_, int p_73154_2_) public Chunk provideChunk(int p_73154_1_, int p_73154_2_)
{ {
@ -314,7 +315,7 @@
+ { + {
+ cachet_KC.remove(hash); + cachet_KC.remove(hash);
+ } + }
+ chunk = (Chunk) chunkt_KC.get(hash); + chunk = (Chunk) chunk_get(p_73154_1_, p_73154_2_);
+ if(chunk != null) + if(chunk != null)
+ { + {
+ cachet_KC.put(hash,chunk); + cachet_KC.put(hash,chunk);
@ -329,8 +330,9 @@
+ if (chunk == this.defaultEmptyChunk) + if (chunk == this.defaultEmptyChunk)
+ { + {
+ return chunk; + return chunk;
+ } }
+
- private Chunk safeLoadChunk(int p_73239_1_, int p_73239_2_)
+ if ((p_73154_1_ != chunk.xPosition || p_73154_2_ != chunk.zPosition) && !worldObj.isProfilingWorld()) + if ((p_73154_1_ != chunk.xPosition || p_73154_2_ != chunk.zPosition) && !worldObj.isProfilingWorld())
+ { + {
+ logger.error("Chunk (" + chunk.xPosition + ", " + chunk.zPosition + ") stored at (" + p_73154_1_ + ", " + p_73154_2_ + ") in world '" + worldObj.getWorld().getName() + "'"); + logger.error("Chunk (" + chunk.xPosition + ", " + chunk.zPosition + ") stored at (" + p_73154_1_ + ", " + p_73154_2_ + ") in world '" + worldObj.getWorld().getName() + "'");
@ -342,15 +344,13 @@
+ chunk.lastAccessedTick = MinecraftServer.getServer().getTickCounter(); // Cauldron + chunk.lastAccessedTick = MinecraftServer.getServer().getTickCounter(); // Cauldron
+ return chunk; + return chunk;
+ // CraftBukkit end + // CraftBukkit end
} + }
+
- private Chunk safeLoadChunk(int p_73239_1_, int p_73239_2_)
+ public Chunk safeLoadChunk(int p_73239_1_, int p_73239_2_) // CraftBukkit - private -> public + public Chunk safeLoadChunk(int p_73239_1_, int p_73239_2_) // CraftBukkit - private -> public
{ {
if (this.currentChunkLoader == null) if (this.currentChunkLoader == null)
{ {
@@ -209,6 +371,7 @@ @@ -209,6 +382,7 @@
public class ChunkProviderServer implements IChunkProvider
{ {
try try
{ {
@ -358,8 +358,7 @@
Chunk chunk = this.currentChunkLoader.loadChunk(this.worldObj, p_73239_1_, p_73239_2_); Chunk chunk = this.currentChunkLoader.loadChunk(this.worldObj, p_73239_1_, p_73239_2_);
if (chunk != null) if (chunk != null)
@@ -217,8 +380,11 @@ @@ -217,8 +391,11 @@
public class ChunkProviderServer implements IChunkProvider
if (this.currentChunkProvider != null) if (this.currentChunkProvider != null)
{ {
@ -371,8 +370,7 @@
} }
return chunk; return chunk;
@@ -231,7 +397,7 @@ @@ -231,7 +408,7 @@
public class ChunkProviderServer implements IChunkProvider
} }
} }
@ -381,8 +379,7 @@
{ {
if (this.currentChunkLoader != null) if (this.currentChunkLoader != null)
{ {
@@ -246,7 +412,7 @@ @@ -246,7 +423,7 @@
public class ChunkProviderServer implements IChunkProvider
} }
} }
@ -391,8 +388,7 @@
{ {
if (this.currentChunkLoader != null) if (this.currentChunkLoader != null)
{ {
@@ -254,15 +420,18 @@ @@ -254,15 +431,18 @@
public class ChunkProviderServer implements IChunkProvider
{ {
p_73242_1_.lastSaveTime = this.worldObj.getTotalWorldTime(); p_73242_1_.lastSaveTime = this.worldObj.getTotalWorldTime();
this.currentChunkLoader.saveChunk(this.worldObj, p_73242_1_); this.currentChunkLoader.saveChunk(this.worldObj, p_73242_1_);
@ -412,8 +408,7 @@
} }
} }
@@ -277,6 +446,35 @@ @@ -277,6 +457,35 @@
public class ChunkProviderServer implements IChunkProvider
if (this.currentChunkProvider != null) if (this.currentChunkProvider != null)
{ {
this.currentChunkProvider.populate(p_73153_1_, p_73153_2_, p_73153_3_); this.currentChunkProvider.populate(p_73153_1_, p_73153_2_, p_73153_3_);
@ -449,8 +444,7 @@
GameRegistry.generateWorld(p_73153_2_, p_73153_3_, worldObj, currentChunkProvider, p_73153_1_); GameRegistry.generateWorld(p_73153_2_, p_73153_3_, worldObj, currentChunkProvider, p_73153_1_);
chunk.setChunkModified(); chunk.setChunkModified();
} }
@@ -286,11 +484,13 @@ @@ -286,11 +495,13 @@
public class ChunkProviderServer implements IChunkProvider
public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_) public boolean saveChunks(boolean p_73151_1_, IProgressUpdate p_73151_2_)
{ {
int i = 0; int i = 0;
@ -467,18 +461,17 @@
if (p_73151_1_) if (p_73151_1_)
{ {
@@ -325,36 +525,73 @@ @@ -325,36 +536,82 @@
public class ChunkProviderServer implements IChunkProvider
{ {
if (!this.worldObj.levelSaving) if (!this.worldObj.levelSaving)
{ {
- for (ChunkCoordIntPair forced : this.worldObj.getPersistentChunks().keySet()) - for (ChunkCoordIntPair forced : this.worldObj.getPersistentChunks().keySet())
+ // Cauldron start - remove any chunk that has a ticket associated with it + // Cauldron start - remove any chunk that has a ticket associated with it
+ if (!this.chunksToUnload.isEmpty()) + if (!this.chunksToUnload.isEmpty())
+ {
+ for (ChunkCoordIntPair forcedChunk : this.worldObj.getPersistentChunks().keys())
{ {
- this.chunksToUnload.remove(ChunkCoordIntPair.chunkXZ2Int(forced.chunkXPos, forced.chunkZPos)); - this.chunksToUnload.remove(ChunkCoordIntPair.chunkXZ2Int(forced.chunkXPos, forced.chunkZPos));
+ for (ChunkCoordIntPair forcedChunk : this.worldObj.getPersistentChunks().keys())
+ {
+ this.chunksToUnload.remove(forcedChunk.chunkXPos, forcedChunk.chunkZPos); + this.chunksToUnload.remove(forcedChunk.chunkXPos, forcedChunk.chunkZPos);
+ } + }
} }
@ -501,18 +494,9 @@
+ } + }
- if (chunk != null) - if (chunk != null)
- {
- chunk.onChunkUnload();
- this.safeSaveChunk(chunk);
- this.safeSaveExtraChunkData(chunk);
- this.loadedChunks.remove(chunk);
- ForgeChunkManager.putDormantChunk(ChunkCoordIntPair.chunkXZ2Int(chunk.xPosition, chunk.zPosition), chunk);
- if(loadedChunks.size() == 0 && ForgeChunkManager.getPersistentChunksFor(this.worldObj).size() == 0 && !DimensionManager.shouldLoadSpawn(this.worldObj.provider.dimensionId)){
- DimensionManager.unloadWorld(this.worldObj.provider.dimensionId);
- return currentChunkProvider.unloadQueuedChunks();
+ // Cauldron static - check if the chunk was accessed recently and keep it loaded if there are players in world + // Cauldron static - check if the chunk was accessed recently and keep it loaded if there are players in world
+ if (!shouldUnloadChunk(chunk) && this.worldObj.playerEntities.size() > 0) + if (!shouldUnloadChunk(chunk) && this.worldObj.playerEntities.size() > 0)
+ { {
+ CauldronHooks.logChunkUnload(this, chunk.xPosition, chunk.zPosition, "** Chunk kept from unloading due to recent activity"); + CauldronHooks.logChunkUnload(this, chunk.xPosition, chunk.zPosition, "** Chunk kept from unloading due to recent activity");
+ continue; + continue;
+ } + }
@ -526,9 +510,9 @@
+ { + {
+ CauldronHooks.logChunkUnload(this, chunk.xPosition, chunk.zPosition, "Unloading Chunk at"); + CauldronHooks.logChunkUnload(this, chunk.xPosition, chunk.zPosition, "Unloading Chunk at");
+ +
+ chunk.onChunkUnload(); chunk.onChunkUnload();
+ this.safeSaveChunk(chunk); this.safeSaveChunk(chunk);
+ this.safeSaveExtraChunkData(chunk); this.safeSaveExtraChunkData(chunk);
+ // Update neighbor counts + // Update neighbor counts
+ for (int x = -2; x < 3; x++) { + for (int x = -2; x < 3; x++) {
+ for (int z = -2; z < 3; z++) { + for (int z = -2; z < 3; z++) {
@ -541,19 +525,31 @@
+ neighbor.setNeighborUnloaded(-x, -z); + neighbor.setNeighborUnloaded(-x, -z);
+ chunk.setNeighborUnloaded(x, z); + chunk.setNeighborUnloaded(x, z);
+ } + }
+ }
+ }
+ this.loadedChunkHashMap_KC.remove(chunkcoordinates); // CraftBukkit
this.loadedChunks.remove(chunk);
- ForgeChunkManager.putDormantChunk(ChunkCoordIntPair.chunkXZ2Int(chunk.xPosition, chunk.zPosition), chunk);
- if(loadedChunks.size() == 0 && ForgeChunkManager.getPersistentChunksFor(this.worldObj).size() == 0 && !DimensionManager.shouldLoadSpawn(this.worldObj.provider.dimensionId)){
+ Chunk[][] temp_bunch_array = chunk_array_get(chunk.xPosition, chunk.zPosition);
+ if(temp_bunch_array != null)
+ {
+ temp_bunch_array[chunk_array(chunk.xPosition)][chunk_array(chunk.zPosition)] = null;
+ int count = 0;
+ not_fully_null:
+ for(int q = 0; q < 16; q++) for(int w = 0; w < 16; w++) { if(temp_bunch_array[q][w] != null) break not_fully_null; count++;}
+ if(count == 256) chunk_array_remove(chunk.xPosition, chunk.zPosition);
+ }
+ ForgeChunkManager.putDormantChunk(chunkcoordinates, chunk);
+ if(this.loadedChunkHashMap_KC.size() == 0 && ForgeChunkManager.getPersistentChunksFor(this.worldObj).size() == 0 && !DimensionManager.shouldLoadSpawn(this.worldObj.provider.dimensionId)){
DimensionManager.unloadWorld(this.worldObj.provider.dimensionId);
return currentChunkProvider.unloadQueuedChunks();
} }
} }
- -
- this.chunksToUnload.remove(olong); - this.chunksToUnload.remove(olong);
- this.loadedChunkHashMap.remove(olong.longValue()); - this.loadedChunkHashMap.remove(olong.longValue());
+ this.loadedChunkHashMap_KC.remove(chunkcoordinates); // CraftBukkit - }
+ this.loadedChunks.remove(chunk); this.chunkt_KC.remove(chunk_hash(chunk.xPosition,chunk.zPosition)); //KCauldron - IntHashMap
+ ForgeChunkManager.putDormantChunk(chunkcoordinates, chunk);
+ if(this.loadedChunkHashMap_KC.size() == 0 && ForgeChunkManager.getPersistentChunksFor(this.worldObj).size() == 0 && !DimensionManager.shouldLoadSpawn(this.worldObj.provider.dimensionId)){
+ DimensionManager.unloadWorld(this.worldObj.provider.dimensionId);
+ return currentChunkProvider.unloadQueuedChunks();
+ }
}
} }
+ // CraftBukkit end + // CraftBukkit end
@ -561,8 +557,7 @@
if (this.currentChunkLoader != null) if (this.currentChunkLoader != null)
{ {
this.currentChunkLoader.chunkTick(); this.currentChunkLoader.chunkTick();
@@ -371,7 +608,7 @@ @@ -371,7 +628,7 @@
public class ChunkProviderServer implements IChunkProvider
public String makeString() public String makeString()
{ {
@ -571,8 +566,7 @@
} }
public List getPossibleCreatures(EnumCreatureType p_73155_1_, int p_73155_2_, int p_73155_3_, int p_73155_4_) public List getPossibleCreatures(EnumCreatureType p_73155_1_, int p_73155_2_, int p_73155_3_, int p_73155_4_)
@@ -386,8 +623,36 @@ @@ -386,8 +643,74 @@
public class ChunkProviderServer implements IChunkProvider
public int getLoadedChunkCount() public int getLoadedChunkCount()
{ {
@ -581,7 +575,6 @@
} }
public void recreateStructures(int p_82695_1_, int p_82695_2_) {} public void recreateStructures(int p_82695_1_, int p_82695_2_) {}
-}
+ +
+ // Cauldron start + // Cauldron start
+ private boolean shouldLoadChunk() + private boolean shouldLoadChunk()
@ -594,9 +587,9 @@
+ +
+ public long lastAccessed(int x, int z) + public long lastAccessed(int x, int z)
+ { + {
+ int chunkHash = chunk_hash(x,z); + Chunk c = chunk_get(x,z);
+ if (!chunkt_KC.containsKey(chunkHash)) return 0; + if(c == null)return 0;
+ return chunkt_KC.get(chunkHash).lastAccessedTick; + else return c.lastAccessedTick;
+ } + }
+ +
+ private boolean shouldUnloadChunk(Chunk chunk) + private boolean shouldUnloadChunk(Chunk chunk)
@ -605,9 +598,47 @@
+ return MinecraftServer.getServer().getTickCounter() - chunk.lastAccessedTick > MinecraftServer.getServer().cauldronConfig.chunkGCGracePeriod.getValue(); + return MinecraftServer.getServer().getTickCounter() - chunk.lastAccessedTick > MinecraftServer.getServer().cauldronConfig.chunkGCGracePeriod.getValue();
+ } + }
+ +
+ public static int chunk_hash(int x, int y) + public static int chunk_hash(int x, int z)
+ { + {
+ return ((x & 0xFFFF) << 16) | (y & 0xFFFF); + return ((x & 0xFFFF) << 16) | (z & 0xFFFF);
+ }
+
+ public static int chunk_array(int index)
+ {
+ return Math.abs(index % 16);
+ }
+
+ private Chunk chunk_get(int x, int z)
+ {
+ Chunk[][] bunch = chunkt_KC.get(chunk_hash(x >> 4, z >> 4));
+ if(bunch == null) return null;
+ return bunch[Math.abs(x % 16)][Math.abs(z % 16)];
+ }
+
+ private Chunk[][] chunk_array_get(int x, int z)
+ {
+ Chunk[][] bunch = chunkt_KC.get(chunk_hash(x >> 4, z >> 4));
+ return bunch;
+ }
+ private Chunk[][] chunk_array_remove(int x, int z)
+ {
+ Chunk[][] bunch = chunkt_KC.remove(chunk_hash(x >> 4, z >> 4));
+ return bunch;
+ }
+
+ public void chunk_put(int x, int z, Chunk chunk)
+ {
+ Chunk[][] temp_chunk_bunch = chunk_array_get(x, z);
+ if(temp_chunk_bunch != null)
+ {
+ temp_chunk_bunch[chunk_array(x)][chunk_array(z)] = chunk;
+ }
+ else
+ {
+ temp_chunk_bunch = new Chunk[16][16];
+ temp_chunk_bunch[chunk_array(x)][chunk_array(z)] = chunk;
+ this.chunkt_KC.put(chunk_hash(x >> 4, z >> 4), temp_chunk_bunch); //KCauldron - IntHash
+ }
+ } + }
+ // Cauldron end + // Cauldron end
+} }

12
patches/net/minecraftforge/common/chunkio/ChunkIOProvider.java.patch
Unescape View File

@ -10,13 +10,13 @@
class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChunk, net.minecraft.world.chunk.Chunk, Runnable, RuntimeException> { class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChunk, net.minecraft.world.chunk.Chunk, Runnable, RuntimeException> {
private final AtomicInteger threadNumber = new AtomicInteger(1); private final AtomicInteger threadNumber = new AtomicInteger(1);
@@ -41,14 +44,36 @@ @@ -41,12 +44,35 @@
queuedChunk.loader.loadEntities(queuedChunk.world, queuedChunk.compound.getCompoundTag("Level"), chunk); queuedChunk.loader.loadEntities(queuedChunk.world, queuedChunk.compound.getCompoundTag("Level"), chunk);
MinecraftForge.EVENT_BUS.post(new ChunkDataEvent.Load(chunk, queuedChunk.compound)); // Don't call ChunkDataEvent.Load async MinecraftForge.EVENT_BUS.post(new ChunkDataEvent.Load(chunk, queuedChunk.compound)); // Don't call ChunkDataEvent.Load async
chunk.lastSaveTime = queuedChunk.provider.worldObj.getTotalWorldTime(); chunk.lastSaveTime = queuedChunk.provider.worldObj.getTotalWorldTime();
- queuedChunk.provider.loadedChunkHashMap.add(ChunkCoordIntPair.chunkXZ2Int(queuedChunk.x, queuedChunk.z), chunk); - queuedChunk.provider.loadedChunkHashMap.add(ChunkCoordIntPair.chunkXZ2Int(queuedChunk.x, queuedChunk.z), chunk);
+ queuedChunk.provider.loadedChunkHashMap_KC.put(LongHash.toLong(queuedChunk.x, queuedChunk.z), chunk); + queuedChunk.provider.loadedChunkHashMap_KC.put(LongHash.toLong(queuedChunk.x, queuedChunk.z), chunk);
+ queuedChunk.provider.chunkt_KC.put(queuedChunk.provider.chunk_hash(queuedChunk.x,queuedChunk.z), chunk); //KCauldron int hashmap + queuedChunk.provider.chunk_put(queuedChunk.x,queuedChunk.z, chunk); //KCauldron int hashmap
queuedChunk.provider.loadedChunks.add(chunk); queuedChunk.provider.loadedChunks.add(chunk);
chunk.onChunkLoad(); chunk.onChunkLoad();
@ -24,13 +24,13 @@
+ queuedChunk.provider.worldObj.timings.syncChunkLoadStructuresTimer.startTiming(); // Spigot + queuedChunk.provider.worldObj.timings.syncChunkLoadStructuresTimer.startTiming(); // Spigot
queuedChunk.provider.currentChunkProvider.recreateStructures(queuedChunk.x, queuedChunk.z); queuedChunk.provider.currentChunkProvider.recreateStructures(queuedChunk.x, queuedChunk.z);
+ queuedChunk.provider.worldObj.timings.syncChunkLoadStructuresTimer.stopTiming(); // Spigot + queuedChunk.provider.worldObj.timings.syncChunkLoadStructuresTimer.stopTiming(); // Spigot
} + }
+ +
+ Server server = queuedChunk.provider.worldObj.getServer(); + Server server = queuedChunk.provider.worldObj.getServer();
+ if (server != null) { + if (server != null) {
+ server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(chunk.bukkitChunk, false)); + server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(chunk.bukkitChunk, false));
+ } + }
+
+ // Update neighbor counts + // Update neighbor counts
+ for (int x = -2; x < 3; x++) { + for (int x = -2; x < 3; x++) {
+ for (int z = -2; z < 3; z++) { + for (int z = -2; z < 3; z++) {
@ -44,8 +44,6 @@
+ chunk.setNeighborLoaded(x, z); + chunk.setNeighborLoaded(x, z);
+ } + }
+ } + }
+ }
+
chunk.populateChunk(queuedChunk.provider, queuedChunk.provider, queuedChunk.x, queuedChunk.z);
} }
chunk.populateChunk(queuedChunk.provider, queuedChunk.provider, queuedChunk.x, queuedChunk.z);

4
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
Unescape View File

@ -262,8 +262,8 @@ public class CraftWorld implements World {
} }
world.theChunkProviderServer.chunksToUnload.remove(x, z); world.theChunkProviderServer.chunksToUnload.remove(x, z);
//net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.loadedChunkHashMap_KC.get(LongHash.toLong(x, z)); net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.loadedChunkHashMap_KC.get(LongHash.toLong(x, z));
net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.chunkt_KC.get(world.theChunkProviderServer.chunk_hash(x,z)); //KCauldron replacement for line above //net.minecraft.world.chunk.Chunk chunk = world.theChunkProviderServer.chunkt_KC.get(world.theChunkProviderServer.chunk_hash(x,z)); //KCauldron replacement for line above
if (chunk == null) { if (chunk == null) {
world.timings.syncChunkLoadTimer.startTiming(); // Spigot world.timings.syncChunkLoadTimer.startTiming(); // Spigot

Write Preview
Loading…
Cancel
Save