CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 08:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

added rudimentary timing code to pinpoint loading bugs.

Browse Source
This commit is contained in:
psygate
2022-06-15 00:31:26 +02:00
parent 80521d67db
commit dbe8b8cbff
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkCoord.java
View File

@@ -9,6 +9,7 @@ import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Supplier;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.World;
import vg.civcraft.mc.civmodcore.CivModCorePlugin;
import vg.civcraft.mc.civmodcore.world.locations.chunkmeta.api.ChunkMetaViewTracker;
@@ -122,9 +123,9 @@ public class ChunkCoord extends XZWCoord {
}
ChunkMeta<?> getMeta(short pluginID, boolean alwaysLoaded) {
// Make this call idempotent
// This call is cheap and should be done in any case. Threads will be parked when necessary on relevant code
// sections.
loadAll();
return chunkMetas.get(pluginID);
}
@@ -146,25 +147,34 @@ public class ChunkCoord extends XZWCoord {
// Lets to an expensive synchronization here if necessary.
synchronized (this) {
if (!isFullyLoaded.get()) {
for (Entry<Short, Supplier<ChunkMeta<?>>> generator : ChunkMetaFactory.getInstance()
.getEmptyChunkFunctions()) {
ChunkMeta<?> chunk = generator.getValue().get();
chunk.setChunkCoord(this);
short pluginID = generator.getKey();
chunk.setPluginID(pluginID);
try {
chunk.populate();
} catch (Exception e) {
CivModCorePlugin.getInstance().getLogger().log(Level.SEVERE, "Failed to load chunk data", e);
timed("Populate empty chunk functions.", () -> {
for (Entry<Short, Supplier<ChunkMeta<?>>> generator : ChunkMetaFactory.getInstance()
.getEmptyChunkFunctions()) {
ChunkMeta<?> chunk = generator.getValue().get();
chunk.setChunkCoord(this);
short pluginID = generator.getKey();
chunk.setPluginID(pluginID);
timed("Populate empty chunk functions: chunk.populate()", chunk::populate);
timed("Populate empty chunk functions: postLoad", () -> ChunkMetaViewTracker.getInstance().get(pluginID).postLoad(chunk));
timed("Populate empty chunk functions: addChunkMeta", () -> addChunkMeta(chunk));
}
ChunkMetaViewTracker.getInstance().get(pluginID).postLoad(chunk);
addChunkMeta(chunk);
}
isFullyLoaded.set(true);
isFullyLoaded.set(true);
});
}
}
}
private void timed(String name, Runnable r) {
long start = System.currentTimeMillis();
try {
r.run();
} catch (Exception e) {
CivModCorePlugin.getInstance().getLogger().log(Level.SEVERE, "Failed to time: \"" + name + "\"", e);
}
CivModCorePlugin.getInstance().getLogger().log(Level.INFO, "Timing: \"" + name + "\" " + (System.currentTimeMillis() - start) + "ms");
}
/**
* Called when the minecraft chunk (the block data) this object is tied to gets
* loaded