diff --git a/mcp/mobius/opis/data/profilers/ProfilerEvent.java b/mcp/mobius/opis/data/profilers/ProfilerEvent.java new file mode 100644 index 0000000..107d4ef --- /dev/null +++ b/mcp/mobius/opis/data/profilers/ProfilerEvent.java @@ -0,0 +1,34 @@ +package mcp.mobius.opis.data.profilers; + +import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; + +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.HashMultimap; + +public class ProfilerEvent extends ProfilerAbstract { + + private Clock clock = new Clock(); + public HashBasedTable data = HashBasedTable.create(); + + @Override + public void reset() { + data.clear(); + } + + @Override + public void start(Object key1, Object key2) { + clock.start(); + } + + @Override + public void stop(Object key1, Object key2) { + clock.stop(); + try{ + data.get(key1.getClass(), key2.getClass()).addValue((double)clock.timeDelta); + } catch (Exception e) { + data.put(key1.getClass(), key2.getClass(), new DescriptiveStatistics(250)); + data.get(key1.getClass(), key2.getClass()).addValue((double)clock.timeDelta); + } + } + +} diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index 9066b8e..08dffd3 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -5,7 +5,11 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; +import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; + +import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; +import com.google.common.collect.Table.Cell; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -27,6 +31,7 @@ import mcp.mobius.opis.data.managers.ChunkManager; import mcp.mobius.opis.data.managers.EntityManager; import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.managers.TileEntityManager; +import mcp.mobius.opis.data.profilers.ProfilerEvent; import mcp.mobius.opis.data.profilers.ProfilerPacket; import mcp.mobius.opis.data.profilers.ProfilerTick; import mcp.mobius.opis.gui.overlay.OverlayStatus; @@ -148,6 +153,13 @@ public enum OpisServerTickHandler implements ITickHandler { OpisPacketHandler.sendFullUpdate(player); } + System.out.printf("================================================\n"); + + HashBasedTable eventData = ((ProfilerEvent)ProfilerSection.EVENT_INVOKE.getProfiler()).data; + for (Cell cell : eventData.cellSet()){ + System.out.printf("%-40s %-90s %.3f µs\n",cell.getRowKey().getName().replace("net.minecraftforge.event.", ""), cell.getColumnKey().getSimpleName(), cell.getValue().getGeometricMean()/1000.); + } + } } } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index ad0d130..64e37cc 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -34,6 +34,7 @@ import mcp.mobius.opis.data.profilers.DeadManSwitch; 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.ProfilerEvent; import mcp.mobius.opis.data.profilers.ProfilerHandlerServer; import mcp.mobius.opis.data.profilers.ProfilerNetworkTick; import mcp.mobius.opis.data.profilers.ProfilerPacket; @@ -168,6 +169,7 @@ public class modOpis { ProfilerSection.PACKET_INBOUND .setProfiler(new ProfilerPacket()); ProfilerSection.PACKET_OUTBOUND .setProfiler(new ProfilerPacket()); ProfilerSection.NETWORK_TICK .setProfiler(new ProfilerNetworkTick()); + ProfilerSection.EVENT_INVOKE .setProfiler(new ProfilerEvent()); event.registerServerCommand(new CommandChunkList()); event.registerServerCommand(new CommandFrequency());