diff --git a/mcp/mobius/opis/commands/server/CommandHandler.java b/mcp/mobius/opis/commands/server/CommandHandler.java index a20f283..a73e430 100644 --- a/mcp/mobius/opis/commands/server/CommandHandler.java +++ b/mcp/mobius/opis/commands/server/CommandHandler.java @@ -6,7 +6,7 @@ import java.util.HashMap; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.commands.IOpisCommand; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; +import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler; @@ -44,10 +44,10 @@ public class CommandHandler extends CommandBase implements IOpisCommand { return; } - ArrayList stats = TickHandlerManager.getCumulatedStats(); + ArrayList stats = TickHandlerManager.getCumulatedStats(); - for (StatsTickHandler s : stats) - icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("%s : %.2f", s.getName(), s.getGeometricMean()))); + for (DataHandler s : stats) + icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("%s : %.2f", s.name, s.update.toString()))); } @Override diff --git a/mcp/mobius/opis/commands/server/CommandStart.java b/mcp/mobius/opis/commands/server/CommandStart.java index 498d9d6..638bf19 100644 --- a/mcp/mobius/opis/commands/server/CommandStart.java +++ b/mcp/mobius/opis/commands/server/CommandStart.java @@ -9,7 +9,6 @@ import mcp.mobius.opis.data.managers.EntityManager; import mcp.mobius.opis.data.managers.MetaManager; import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.managers.TileEntityManager; -import mcp.mobius.opis.data.server.HandlerProfiler; import mcp.mobius.opis.events.OpisServerTickHandler; import mcp.mobius.opis.events.PlayerTracker; import mcp.mobius.opis.network.OpisPacketHandler; @@ -53,7 +52,6 @@ public class CommandStart extends CommandBase implements IOpisCommand { MetaManager.reset(); modOpis.profilerRun = true; - ProfilerRegistrar.turnOn(); ProfilerSection.activateAll(); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); diff --git a/mcp/mobius/opis/data/client/DataCache.java b/mcp/mobius/opis/data/client/DataCache.java index bb23bd9..9fe1274 100644 --- a/mcp/mobius/opis/data/client/DataCache.java +++ b/mcp/mobius/opis/data/client/DataCache.java @@ -37,8 +37,6 @@ import mcp.mobius.opis.data.holders.stats.StatAbstract; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.holders.stats.StatsEntity; import mcp.mobius.opis.data.holders.stats.StatsPlayer; -import mcp.mobius.opis.data.holders.stats.StatsTick; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.helpers.ModIdentification; import mcp.mobius.opis.network.enums.AccessLevel; diff --git a/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java b/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java deleted file mode 100644 index 52e8a36..0000000 --- a/mcp/mobius/opis/data/client/TickHandlerClientProfiler.java +++ /dev/null @@ -1,74 +0,0 @@ -package mcp.mobius.opis.data.client; - -import java.util.EnumSet; - -import mcp.mobius.mobiuscore.profiler.IProfilerHandler; -import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.managers.TickHandlerManager; -import mcp.mobius.opis.events.OpisClientTickHandler; -import mcp.mobius.opis.events.OpisServerTickHandler; -import cpw.mods.fml.common.IScheduledTickHandler; -import cpw.mods.fml.common.TickType; - -public class TickHandlerClientProfiler implements IProfilerHandler { - - public class Clock{ - public long startTime = 0; - public long timeDelta = 0; - public void start(){this.startTime = System.nanoTime();} - public void stop(){this.timeDelta = System.nanoTime() - this.startTime;} - } - - private String currentHandler = null; - private Clock clock = new Clock(); - - @Override - public void StartTickStart(IScheduledTickHandler ticker, EnumSet ticksToRun) { - if (OpisClientTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.RENDER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - this.currentHandler = name; - this.clock.start(); - } - - @Override - public void StopTickStart(IScheduledTickHandler ticker, EnumSet ticksToRun) { - this.clock.stop(); - if (OpisClientTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.RENDER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - if (!this.currentHandler.equals(name)) - throw new RuntimeException(String.format("Mismatched tick handler during the profiling ! %s %s", this.currentHandler, ticker.getLabel())); - - //EntityManager.addEntity(ent, this.clock.timeDelta); - TickHandlerManager.addHandlerStart(ticker, this.clock.timeDelta); - this.currentHandler = null; - } - - @Override - public void StartTickEnd(IScheduledTickHandler ticker, EnumSet ticksToRun) { - if (OpisClientTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.RENDER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - this.currentHandler = name; - this.clock.start(); - } - - @Override - public void StopTickEnd(IScheduledTickHandler ticker, EnumSet ticksToRun) { - this.clock.stop(); - if (OpisClientTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.RENDER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - if (!this.currentHandler.equals(name)) - throw new RuntimeException(String.format("Mismatched tick handler during the profiling ! %s %s", this.currentHandler, ticker.getLabel())); - - TickHandlerManager.addHandlerEnd(ticker, this.clock.timeDelta); - this.currentHandler = null; - } - -} diff --git a/mcp/mobius/opis/data/holders/newtypes/DataHandler.java b/mcp/mobius/opis/data/holders/newtypes/DataHandler.java new file mode 100644 index 0000000..5e04c9f --- /dev/null +++ b/mcp/mobius/opis/data/holders/newtypes/DataHandler.java @@ -0,0 +1,45 @@ +package mcp.mobius.opis.data.holders.newtypes; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.network.packet.Packet; +import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.opis.data.holders.ISerializable; +import mcp.mobius.opis.data.managers.TickHandlerManager; +import mcp.mobius.opis.data.profilers.ProfilerHandlerServer; +import cpw.mods.fml.common.IScheduledTickHandler; + +public class DataHandler implements ISerializable, Comparable { + public String name; + public DataTiming update; + + public DataHandler fill(IScheduledTickHandler ticker){ + double timingPre = ((ProfilerHandlerServer)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).data.get(ticker).getGeometricMean(); + double timingPost = ((ProfilerHandlerServer)(ProfilerSection.HANDLER_TICKSTOP.getProfiler())).data.get(ticker).getGeometricMean(); + + this.update = new DataTiming(timingPre + timingPost); + this.name = TickHandlerManager.getHandlerName(ticker); + + return this; + } + + @Override + public void writeToStream(DataOutputStream stream) throws IOException { + Packet.writeString(this.name, stream); + this.update.writeToStream(stream); + } + + public static DataHandler readFromStream(DataInputStream stream) throws IOException { + DataHandler retVal = new DataHandler(); + retVal.name = Packet.readString(stream, 255); + retVal.update = DataTiming.readFromStream(stream); + return retVal; + } + + @Override + public int compareTo(Object o) { + return this.update.compareTo(((DataHandler)o).update); + } +} diff --git a/mcp/mobius/opis/data/holders/stats/StatsMod.java b/mcp/mobius/opis/data/holders/stats/StatsMod.java deleted file mode 100644 index 5fe0565..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsMod.java +++ /dev/null @@ -1,103 +0,0 @@ -package mcp.mobius.opis.data.holders.stats; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; - -import mcp.mobius.opis.data.holders.ISerializable; -import net.minecraft.network.packet.Packet; - -public class StatsMod implements ISerializable, Comparable{ - private String modID; - public double meanTime; - public double meanGeom; - public double variance; - public double minTime; - public double maxTime; - public double median; - public double total; - public int ntes; - - private double cachedMedian = -1.0; - - public DescriptiveStatistics dstat = new DescriptiveStatistics(); - - public StatsMod(String modID){ - this.modID = modID; - - if (this.modID == null) - this.modID = ""; - } - - public void addStat(StatsTileEntity tes){ - this.dstat.addValue(tes.getGeometricMean()); - } - - //public double getMeanTimePerEntity(){ - // return this.dstat.getMean(); - //} - - public String getModID(){ - return this.modID; - } - - public double getMedian(){ - if (this.cachedMedian < 0.0){ - int ndata = (int)this.dstat.getN(); - if (ndata == 1) - return this.dstat.getElement(0); - - if (ndata % 2 == 1) - return this.dstat.getSortedValues()[ndata/2]; - - if (ndata % 2 == 0) - return (this.dstat.getSortedValues()[ndata/2 - 1] + this.dstat.getSortedValues()[ndata/2]) / 2; - } - return this.cachedMedian; - } - - @Override - public int compareTo(Object o) { - //return this.dstat.getMean() > ((ModStats)o).dstat.getMean() ? -1 : 1; - //return this.meanTime > ((ModStats)o).meanTime ? -1 : 1; - return this.getMedian() > ((StatsMod)o).getMedian() ? -1 : 1; - } - - @Override - public void writeToStream(DataOutputStream stream) throws IOException { - Packet.writeString(this.modID, stream); - - stream.writeDouble(dstat.getMean()); - stream.writeDouble(dstat.getGeometricMean()); - stream.writeDouble(dstat.getVariance()); - stream.writeDouble(dstat.getMin()); - stream.writeDouble(dstat.getMax()); - stream.writeDouble(dstat.getSum()); - stream.writeDouble(this.getMedian()); - stream.writeInt((int)dstat.getN()); - } - - public static StatsMod readFromStream(DataInputStream stream) throws IOException { - String modID = Packet.readString(stream, 255); - StatsMod modStats = new StatsMod(modID); - - modStats.meanTime = stream.readDouble(); - modStats.meanGeom = stream.readDouble(); - modStats.variance = stream.readDouble(); - modStats.minTime = stream.readDouble(); - modStats.maxTime = stream.readDouble(); - modStats.total = stream.readDouble(); - modStats.median = stream.readDouble(); - modStats.ntes = stream.readInt(); - - modStats.cachedMedian = modStats.median; - return modStats; - } - - public String toString(){ - return String.format("[ %s ] %d %.2f %.2f", this.modID, this.ntes, this.meanTime, this.dstat.getMean()); - } - -} diff --git a/mcp/mobius/opis/data/holders/stats/StatsTick.java b/mcp/mobius/opis/data/holders/stats/StatsTick.java deleted file mode 100644 index 34fdd76..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsTick.java +++ /dev/null @@ -1,26 +0,0 @@ -package mcp.mobius.opis.data.holders.stats; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; - -public class StatsTick extends StatAbstract { - - public StatsTick(){ - this.dstat = new DescriptiveStatistics(20); - } - - @Override - public void writeToStream(DataOutputStream stream) throws IOException { - //stream.writeDouble(this.getGeometricMean()); - stream.writeDouble(this.dstat.getGeometricMean()); - } - - public static StatsTick readFromStream(DataInputStream stream) throws IOException { - StatsTick stat = new StatsTick(); - stat.setGeometricMean(stream.readDouble()); - return stat; - } -} diff --git a/mcp/mobius/opis/data/holders/stats/StatsTickHandler.java b/mcp/mobius/opis/data/holders/stats/StatsTickHandler.java deleted file mode 100644 index ee9774d..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsTickHandler.java +++ /dev/null @@ -1,34 +0,0 @@ -package mcp.mobius.opis.data.holders.stats; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import mcp.mobius.opis.data.holders.ISerializable; -import net.minecraft.network.packet.Packet; - -import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; - -public class StatsTickHandler extends StatAbstract implements ISerializable{ - - public StatsTickHandler(String name){ - this.name = name; - } - - public String toString(){ - return String.format("%.3f µs", this.getGeometricMean()); - } - - @Override - public void writeToStream(DataOutputStream stream) throws IOException { - Packet.writeString(this.name, stream); - stream.writeDouble(this.getGeometricMean()); - } - - public static StatsTickHandler readFromStream(DataInputStream stream) throws IOException { - StatsTickHandler stats = new StatsTickHandler(Packet.readString(stream, 255)); - stats.setGeometricMean(stream.readDouble()); - return stats; - } - -} diff --git a/mcp/mobius/opis/data/holders/stats/StatsWorld.java b/mcp/mobius/opis/data/holders/stats/StatsWorld.java deleted file mode 100644 index ae482cc..0000000 --- a/mcp/mobius/opis/data/holders/stats/StatsWorld.java +++ /dev/null @@ -1,30 +0,0 @@ -package mcp.mobius.opis.data.holders.stats; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import mcp.mobius.opis.data.holders.ISerializable; - -public class StatsWorld extends StatAbstract implements ISerializable { - - private int dim = 0; - - public StatsWorld(int dim){ - this.dim = dim; - } - - @Override - public void writeToStream(DataOutputStream stream) throws IOException { - stream.writeInt(this.dim); - stream.writeDouble(this.getGeometricMean()); - } - - public static StatsWorld readFromStream(DataInputStream stream) throws IOException { - int dim = stream.readInt(); - StatsWorld stat = new StatsWorld(dim); - stat.setGeometricMean(stream.readDouble()); - return stat; - } - -} diff --git a/mcp/mobius/opis/data/managers/MetaManager.java b/mcp/mobius/opis/data/managers/MetaManager.java index cb7187d..dcf85cd 100644 --- a/mcp/mobius/opis/data/managers/MetaManager.java +++ b/mcp/mobius/opis/data/managers/MetaManager.java @@ -11,8 +11,6 @@ public class MetaManager { modOpis.profilerRun = false; modOpis.selectedBlock = null; OpisServerTickHandler.instance.profilerRunningTicks = 0; - TickHandlerManager.startStats.clear(); - TickHandlerManager.endStats.clear(); ProfilerRegistrar.turnOff(); ProfilerSection.resetAll(); diff --git a/mcp/mobius/opis/data/managers/TickHandlerManager.java b/mcp/mobius/opis/data/managers/TickHandlerManager.java index d2cb33b..4480810 100644 --- a/mcp/mobius/opis/data/managers/TickHandlerManager.java +++ b/mcp/mobius/opis/data/managers/TickHandlerManager.java @@ -7,13 +7,13 @@ import java.util.HashMap; import cpw.mods.fml.common.IScheduledTickHandler; import cpw.mods.fml.common.SingleIntervalHandler; +import mcp.mobius.mobiuscore.profiler_v2.ProfilerSection; +import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTiming; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; +import mcp.mobius.opis.data.profilers.ProfilerHandlerServer; public class TickHandlerManager { - public static HashMap startStats = new HashMap(); - public static HashMap endStats = new HashMap(); public static Class SingleIntervalHandlerReflect; public static Field wrapped; @@ -30,35 +30,14 @@ public class TickHandlerManager { } } - public static void addHandlerStart(IScheduledTickHandler handler, long timing){ - String name = getHandlerName(handler); + public static ArrayList getCumulatedStats(){ + ArrayList retVal = new ArrayList(); + for (IScheduledTickHandler ticker : ((ProfilerHandlerServer)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).data.keySet()) + retVal.add(new DataHandler().fill(ticker)); - if (!(startStats.containsKey(name))) - startStats.put(name, new StatsTickHandler(name)); - startStats.get(name).addMeasure(timing); - } - - public static void addHandlerEnd(IScheduledTickHandler handler, long timing){ - String name = getHandlerName(handler); + Collections.sort(retVal); - if (!(endStats.containsKey(name))) - endStats.put(name, new StatsTickHandler(name)); - endStats.get(name).addMeasure(timing); - } - - public static ArrayList getCumulatedStats(){ - HashMap totalStats = new HashMap(); - - for (String key : startStats.keySet()){ - totalStats.put(key, new StatsTickHandler(key)); - totalStats.get(key).setGeometricMean(startStats.get(key).getGeometricMean() + endStats.get(key).getGeometricMean()); - totalStats.get(key).dataPoints = startStats.get(key).getDataPoints() + endStats.get(key).getDataPoints(); - } - - ArrayList sortedStats = new ArrayList(totalStats.values()); - Collections.sort(sortedStats); - - return sortedStats; + return retVal; } public static String getHandlerName(IScheduledTickHandler handler){ @@ -83,11 +62,10 @@ public class TickHandlerManager { } public static DataTiming getTotalUpdateTime(){ - ArrayList tickCumul = getCumulatedStats(); double updateTime = 0D; - for (StatsTickHandler data : tickCumul){ - updateTime += data.getGeometricMean(); - } + for (IScheduledTickHandler ticker : ((ProfilerHandlerServer)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).data.keySet()) + updateTime += new DataHandler().fill(ticker).update.timing; + return new DataTiming(updateTime); } } diff --git a/mcp/mobius/opis/data/managers/TileEntityManager.java b/mcp/mobius/opis/data/managers/TileEntityManager.java index 63e5a1c..ebbce28 100644 --- a/mcp/mobius/opis/data/managers/TileEntityManager.java +++ b/mcp/mobius/opis/data/managers/TileEntityManager.java @@ -12,7 +12,6 @@ import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatsChunk; -import mcp.mobius.opis.data.holders.stats.StatsMod; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate; import mcp.mobius.opis.helpers.ModIdentification; diff --git a/mcp/mobius/opis/data/profilers/ProfilerHandlerServer.java b/mcp/mobius/opis/data/profilers/ProfilerHandlerServer.java new file mode 100644 index 0000000..a554e20 --- /dev/null +++ b/mcp/mobius/opis/data/profilers/ProfilerHandlerServer.java @@ -0,0 +1,42 @@ +package mcp.mobius.opis.data.profilers; + +import java.util.EnumSet; +import java.util.WeakHashMap; + +import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; + +import cpw.mods.fml.common.IScheduledTickHandler; +import cpw.mods.fml.common.TickType; + +public class ProfilerHandlerServer extends ProfilerAbstract { + + private Clock clock = new Clock(); + public WeakHashMap data = new WeakHashMap(); + + @Override + public void reset() { + + } + + @Override + public void start(Object key1, Object key2) { + IScheduledTickHandler ticker = (IScheduledTickHandler) key1; + EnumSet ticksToRun = (EnumSet) key2; + if (!ticksToRun.contains(TickType.SERVER) || ticksToRun.size() != 1) return; + + if (!data.containsKey(ticker)) + data.put(ticker, new DescriptiveStatistics()); + + clock.start(); + } + + @Override + public void stop(Object key1, Object key2) { + IScheduledTickHandler ticker = (IScheduledTickHandler) key1; + EnumSet ticksToRun = (EnumSet) key2; + if (!ticksToRun.contains(TickType.SERVER) || ticksToRun.size() != 1) return; + + clock.stop(); + data.get(ticker).addValue((double)clock.timeDelta); + } +} diff --git a/mcp/mobius/opis/data/server/HandlerProfiler.java b/mcp/mobius/opis/data/server/HandlerProfiler.java deleted file mode 100644 index 5812387..0000000 --- a/mcp/mobius/opis/data/server/HandlerProfiler.java +++ /dev/null @@ -1,65 +0,0 @@ -package mcp.mobius.opis.data.server; - -import java.util.EnumSet; - -import cpw.mods.fml.common.IScheduledTickHandler; -import cpw.mods.fml.common.TickType; -import mcp.mobius.mobiuscore.profiler.IProfilerHandler; -import mcp.mobius.opis.modOpis; -import mcp.mobius.opis.data.managers.TickHandlerManager; -import mcp.mobius.opis.events.OpisServerTickHandler; - -public class HandlerProfiler extends AbstractProfiler implements IProfilerHandler { - - private String currentHandler = null; - - @Override - public void StartTickStart(IScheduledTickHandler ticker, EnumSet ticksToRun) { - if (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.SERVER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - this.currentHandler = name; - this.clock.start(); - } - - @Override - public void StopTickStart(IScheduledTickHandler ticker, EnumSet ticksToRun) { - this.clock.stop(); - if (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.SERVER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - if (!this.currentHandler.equals(name)) - throw new RuntimeException(String.format("Mismatched tick handler during the profiling ! %s %s", this.currentHandler, ticker.getLabel())); - - //EntityManager.addEntity(ent, this.clock.timeDelta); - TickHandlerManager.addHandlerStart(ticker, this.clock.timeDelta); - this.currentHandler = null; - } - - @Override - public void StartTickEnd(IScheduledTickHandler ticker, EnumSet ticksToRun) { - if (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.SERVER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - this.currentHandler = name; - this.clock.start(); - } - - @Override - public void StopTickEnd(IScheduledTickHandler ticker, EnumSet ticksToRun) { - this.clock.stop(); - if (OpisServerTickHandler.instance.profilerUpdateTickCounter % modOpis.profilerDelay != 0) return; - if (!ticksToRun.contains(TickType.SERVER) || ticksToRun.size() != 1) return; - - String name = TickHandlerManager.getHandlerName(ticker); - if (!this.currentHandler.equals(name)) - throw new RuntimeException(String.format("Mismatched tick handler during the profiling ! %s %s", this.currentHandler, ticker.getLabel())); - - TickHandlerManager.addHandlerEnd(ticker, this.clock.timeDelta); - this.currentHandler = null; - } - -} diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index 2b8a0d2..079b057 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -23,7 +23,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.holders.stats.StatsChunkMedian; import mcp.mobius.opis.data.holders.stats.StatsEntity; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.data.managers.ChunkManager; import mcp.mobius.opis.data.managers.EntityManager; diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index af5011f..ccfa4c3 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -30,15 +30,14 @@ import mcp.mobius.opis.commands.server.CommandStop; import mcp.mobius.opis.commands.server.CommandTicks; import mcp.mobius.opis.commands.server.CommandTimingEntities; import mcp.mobius.opis.commands.server.CommandTimingTileEntities; -import mcp.mobius.opis.data.client.TickHandlerClientProfiler; import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.profilers.ProfilerDimBlockTick; import mcp.mobius.opis.data.profilers.ProfilerDimTick; import mcp.mobius.opis.data.profilers.ProfilerEntityUpdate; +import mcp.mobius.opis.data.profilers.ProfilerHandlerServer; import mcp.mobius.opis.data.profilers.ProfilerTick; import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate; import mcp.mobius.opis.data.server.DeadManSwitch; -import mcp.mobius.opis.data.server.HandlerProfiler; import mcp.mobius.opis.data.server.NetworkProfiler; import mcp.mobius.opis.events.OpisClientEventHandler; import mcp.mobius.opis.events.OpisClientTickHandler; @@ -134,7 +133,6 @@ public class modOpis { TickRegistry.registerTickHandler(new OpisServerTickHandler(), Side.SERVER); TickRegistry.registerTickHandler(new OpisClientTickHandler(), Side.CLIENT); - ProfilerRegistrar.registerProfilerHandler(new HandlerProfiler()); ProfilerRegistrar.registerProfilerPacket(NetworkProfiler.INSTANCE); if (lagGenID != -1){ @@ -148,6 +146,8 @@ public class modOpis { ProfilerSection.ENTITY_UPDATETIME .setProfiler(new ProfilerEntityUpdate()); ProfilerSection.TICK .setProfiler(new ProfilerTick()); ProfilerSection.TILEENT_UPDATETIME .setProfiler(new ProfilerTileEntityUpdate()); + ProfilerSection.HANDLER_TICKSTART .setProfiler(new ProfilerHandlerServer()); + ProfilerSection.HANDLER_TICKSTOP .setProfiler(new ProfilerHandlerServer()); } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 0493e3b..93f8c2a 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -23,11 +23,11 @@ import mcp.mobius.opis.data.holders.basetypes.SerialLong; import mcp.mobius.opis.data.holders.basetypes.TicketData; import mcp.mobius.opis.data.holders.newtypes.DataBlockTick; import mcp.mobius.opis.data.holders.newtypes.DataEntity; +import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.holders.stats.StatsEntity; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.data.managers.ChunkManager; import mcp.mobius.opis.data.managers.EntityManager; @@ -200,14 +200,14 @@ public class OpisPacketHandler implements IPacketHandler { } public static void sendFullUpdate(Player player){ - ArrayList timingHandlers = TickHandlerManager.getCumulatedStats(); ArrayList timingEntities = EntityManager.INSTANCE.getWorses(100); ArrayList timingTileEnts = TileEntityManager.INSTANCE.getWorses(100); + ArrayList timingHandlers = TickHandlerManager.getCumulatedStats(); ArrayList timingChunks = ChunkManager.INSTANCE.getTopChunks(100); + DataTiming totalTimeTE = TileEntityManager.INSTANCE.getTotalUpdateTime(); DataTiming totalTimeEnt = EntityManager.INSTANCE.getTotalUpdateTime(); DataTiming totalTimeHandler = TickHandlerManager.getTotalUpdateTime(); - DataBlockTick totalWorldTick = new DataBlockTick().fill(); @@ -220,7 +220,7 @@ public class OpisPacketHandler implements IPacketHandler { OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTimeHandler), player); OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_WORLDTICK, totalWorldTick), player); - OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(TickHandlerManager.startStats.size())), player); + OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_AMOUNT_HANDLERS, new SerialInt(timingHandlers.size())), player); OpisPacketHandler.validateAndSend(NetDataValue.create(Message.STATUS_TIME_LAST_RUN, new SerialLong(ProfilerRegistrar.timeStampLastRun)), player); diff --git a/mcp/mobius/opis/network/ServerMessageHandler.java b/mcp/mobius/opis/network/ServerMessageHandler.java index d6a84a4..132fae8 100644 --- a/mcp/mobius/opis/network/ServerMessageHandler.java +++ b/mcp/mobius/opis/network/ServerMessageHandler.java @@ -26,11 +26,11 @@ import mcp.mobius.opis.data.holders.basetypes.SerialString; import mcp.mobius.opis.data.holders.basetypes.TargetEntity; import mcp.mobius.opis.data.holders.newtypes.DataBlockTick; import mcp.mobius.opis.data.holders.newtypes.DataEntity; +import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.holders.stats.StatsEntity; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.data.managers.ChunkManager; import mcp.mobius.opis.data.managers.EntityManager; @@ -103,7 +103,7 @@ public class ServerMessageHandler { } else if (maintype == Message.LIST_TIMING_HANDLERS){ - ArrayList timingHandlers = TickHandlerManager.getCumulatedStats(); + ArrayList timingHandlers = TickHandlerManager.getCumulatedStats(); DataTiming totalTime = TickHandlerManager.getTotalUpdateTime(); OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), (Player)player); OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTime), (Player)player); @@ -146,7 +146,6 @@ public class ServerMessageHandler { else if (maintype == Message.COMMAND_START){ MetaManager.reset(); modOpis.profilerRun = true; - ProfilerRegistrar.turnOn(); ProfilerSection.activateAll(); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_START, new SerialInt(modOpis.profilerMaxTicks))); } diff --git a/mcp/mobius/opis/network/packets/server/NetDataList.java b/mcp/mobius/opis/network/packets/server/NetDataList.java index b82c647..eb3475d 100644 --- a/mcp/mobius/opis/network/packets/server/NetDataList.java +++ b/mcp/mobius/opis/network/packets/server/NetDataList.java @@ -11,11 +11,6 @@ import java.util.List; import mcp.mobius.opis.data.holders.ISerializable; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; -import mcp.mobius.opis.data.holders.stats.StatAbstract; -import mcp.mobius.opis.data.holders.stats.StatsChunk; -import mcp.mobius.opis.data.holders.stats.StatsEntity; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; -import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.enums.Packets; import net.minecraft.network.packet.Packet; diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index 8395e4e..b140c82 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -16,10 +16,9 @@ import mcp.mobius.opis.api.IMessageHandler; import mcp.mobius.opis.api.MessageHandlerRegistrar; import mcp.mobius.opis.api.TabPanelRegistrar; import mcp.mobius.opis.data.client.DataCache; +import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.holders.stats.StatsEntity; -import mcp.mobius.opis.data.holders.stats.StatsMod; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.data.managers.ChunkManager; import mcp.mobius.opis.data.managers.MetaManager; @@ -148,14 +147,13 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ modOpis.log.log(Level.INFO, "Started profiling"); MetaManager.reset(); modOpis.profilerRun = true; - ProfilerRegistrar.turnOn(); ProfilerSection.activateAll(); break; } case CLIENT_SHOW_RENDER_TICK:{ modOpis.log.log(Level.INFO, "=== RENDER TICK ==="); - ArrayList stats = TickHandlerManager.getCumulatedStats(); - for (StatsTickHandler stat : stats){ + ArrayList stats = TickHandlerManager.getCumulatedStats(); + for (DataHandler stat : stats){ System.out.printf("%s \n", stat); } break; diff --git a/mcp/mobius/opis/proxy/ProxyServer.java b/mcp/mobius/opis/proxy/ProxyServer.java index 81481b4..89bb00a 100644 --- a/mcp/mobius/opis/proxy/ProxyServer.java +++ b/mcp/mobius/opis/proxy/ProxyServer.java @@ -5,11 +5,6 @@ import java.util.HashMap; import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.api.IMessageHandler; -import mcp.mobius.opis.data.holders.stats.StatsChunk; -import mcp.mobius.opis.data.holders.stats.StatsEntity; -import mcp.mobius.opis.data.holders.stats.StatsMod; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; -import mcp.mobius.opis.data.holders.stats.StatsTileEntity; import mcp.mobius.opis.gui.overlay.OverlayStatus; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataRaw; diff --git a/mcp/mobius/opis/swing/panels/PanelSummary.java b/mcp/mobius/opis/swing/panels/PanelSummary.java index 0463057..1353b85 100644 --- a/mcp/mobius/opis/swing/panels/PanelSummary.java +++ b/mcp/mobius/opis/swing/panels/PanelSummary.java @@ -19,7 +19,6 @@ import mcp.mobius.opis.data.holders.newtypes.DataBlockTick; import mcp.mobius.opis.data.holders.newtypes.DataTileEntity; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.newtypes.DataTimingMillisecond; -import mcp.mobius.opis.data.holders.stats.StatsTick; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.server.NetDataRaw; diff --git a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java index e6c4dfe..fd476d7 100644 --- a/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java +++ b/mcp/mobius/opis/swing/panels/PanelTimingHandlers.java @@ -5,9 +5,9 @@ import java.awt.event.ActionListener; import mcp.mobius.opis.api.ITabPanel; import mcp.mobius.opis.data.holders.basetypes.SerialDouble; +import mcp.mobius.opis.data.holders.newtypes.DataHandler; import mcp.mobius.opis.data.holders.newtypes.DataTiming; import mcp.mobius.opis.data.holders.stats.StatAbstract; -import mcp.mobius.opis.data.holders.stats.StatsTickHandler; import mcp.mobius.opis.network.enums.AccessLevel; import mcp.mobius.opis.network.enums.Message; import mcp.mobius.opis.network.packets.client.Packet_ReqData; @@ -57,7 +57,7 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{ } ) { Class[] columnTypes = new Class[] { - String.class, StatAbstract.class + String.class, DataTiming.class }; boolean[] columnEditables = new boolean[] { false, false @@ -92,11 +92,11 @@ public class PanelTimingHandlers extends JPanelMsgHandler implements ITabPanel{ ((JTableStats)this.getTable()).setTableData(rawdata.array); DefaultTableModel model = (DefaultTableModel)table.getModel(); - int row = this.updateData(table, model, StatsTickHandler.class); + int row = this.updateData(table, model, DataHandler.class); for (Object o : rawdata.array){ - StatsTickHandler stat = (StatsTickHandler)o; - model.addRow(new Object[] {stat.getName(), stat}); + DataHandler data = (DataHandler)o; + model.addRow(new Object[] {data.name, data.update}); } this.dataUpdated(table, model, row);