From e5a969cd480c81b42d8a4acf1ff3be6e03ce338b Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 23 Dec 2013 02:32:27 +0100 Subject: [PATCH] Full handler handling --- mcp/mobius/opis/commands/CommandHandler.java | 15 ++---- mcp/mobius/opis/data/TickHandlerManager.java | 17 ++++++ .../opis/data/holders/TickHandlerStats.java | 30 ++++++++++- .../opis/gui/screens/ScreenTickHandler.java | 43 +++++++++++++++ mcp/mobius/opis/modOpis.java | 2 +- mcp/mobius/opis/network/DataReqHandler.java | 1 + .../opis/network/OpisPacketHandler.java | 6 +++ mcp/mobius/opis/network/Packets.java | 3 +- .../Packet_DataScreenTimingHandlers.java | 52 +++++++++++++++++++ mcp/mobius/opis/proxy/ProxyClient.java | 9 ++++ mcp/mobius/opis/proxy/ProxyServer.java | 2 + 11 files changed, 167 insertions(+), 13 deletions(-) create mode 100644 mcp/mobius/opis/gui/screens/ScreenTickHandler.java create mode 100644 mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java diff --git a/mcp/mobius/opis/commands/CommandHandler.java b/mcp/mobius/opis/commands/CommandHandler.java index 8faaf35..a59bc0a 100644 --- a/mcp/mobius/opis/commands/CommandHandler.java +++ b/mcp/mobius/opis/commands/CommandHandler.java @@ -1,9 +1,12 @@ package mcp.mobius.opis.commands; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import mcp.mobius.opis.data.TickHandlerManager; import mcp.mobius.opis.data.holders.TickHandlerStats; +import mcp.mobius.opis.network.server.Packet_DataScreenTimingHandlers; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; @@ -25,16 +28,8 @@ public class CommandHandler extends CommandBase implements IOpisCommand { @Override public void processCommand(ICommandSender icommandsender, String[] astring) { - HashMap startStats = TickHandlerManager.startStats; - HashMap endStats = TickHandlerManager.endStats; - - System.out.printf("== TICK START ==\n"); - for (String stats : startStats.keySet()) - System.out.printf("%s\n", startStats.get(stats)); - - System.out.printf("== TICK END ==\n"); - for (String stats : endStats.keySet()) - System.out.printf("%s\n", endStats.get(stats)); + ArrayList stats = TickHandlerManager.getCumulatedStats(); + ((EntityPlayerMP)icommandsender).playerNetServerHandler.sendPacketToPlayer(Packet_DataScreenTimingHandlers.create(stats)); } @Override diff --git a/mcp/mobius/opis/data/TickHandlerManager.java b/mcp/mobius/opis/data/TickHandlerManager.java index 883cc66..dba7e92 100644 --- a/mcp/mobius/opis/data/TickHandlerManager.java +++ b/mcp/mobius/opis/data/TickHandlerManager.java @@ -1,5 +1,7 @@ package mcp.mobius.opis.data; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import cpw.mods.fml.common.IScheduledTickHandler; @@ -22,4 +24,19 @@ public class TickHandlerManager { endStats.get(handler.getLabel()).addMeasure(timing); } + public static ArrayList getCumulatedStats(){ + HashMap totalStats = new HashMap(); + + for (String key : startStats.keySet()){ + totalStats.put(key, new TickHandlerStats(key)); + totalStats.get(key).setGeometricMean(startStats.get(key).getGeometricMean() + endStats.get(key).getGeometricMean()); + } + + ArrayList sortedStats = new ArrayList(totalStats.values()); + Collections.sort(sortedStats); + + return sortedStats; + } + + } diff --git a/mcp/mobius/opis/data/holders/TickHandlerStats.java b/mcp/mobius/opis/data/holders/TickHandlerStats.java index c2b27a4..3fb45c8 100644 --- a/mcp/mobius/opis/data/holders/TickHandlerStats.java +++ b/mcp/mobius/opis/data/holders/TickHandlerStats.java @@ -1,8 +1,14 @@ package mcp.mobius.opis.data.holders; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.network.packet.Packet; + import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; -public class TickHandlerStats { +public class TickHandlerStats implements ISerializable, Comparable{ public DescriptiveStatistics dstat = new DescriptiveStatistics(); // Stored in microseconds ! private String name; @@ -34,6 +40,28 @@ public class TickHandlerStats { public String toString(){ return String.format("[%50s] %.3f micros", this.name, this.getGeometricMean()); + } + + @Override + public int compareTo(Object o) { + double value = ((TickHandlerStats)o).getGeometricMean() - this.getGeometricMean(); + if (value > 0) + return 1; + if (value < 0) + return -1; + return 0; + } + + @Override + public void writeToStream(DataOutputStream stream) throws IOException { + Packet.writeString(this.name, stream); + stream.writeDouble(this.getGeometricMean()); + } + + public static TickHandlerStats readFromStream(DataInputStream stream) throws IOException { + TickHandlerStats stats = new TickHandlerStats(Packet.readString(stream, 255)); + stats.setGeometricMean(stream.readDouble()); + return stats; } } diff --git a/mcp/mobius/opis/gui/screens/ScreenTickHandler.java b/mcp/mobius/opis/gui/screens/ScreenTickHandler.java new file mode 100644 index 0000000..d2535c7 --- /dev/null +++ b/mcp/mobius/opis/gui/screens/ScreenTickHandler.java @@ -0,0 +1,43 @@ +package mcp.mobius.opis.gui.screens; + +import java.util.ArrayList; + +import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.data.holders.TickHandlerStats; +import mcp.mobius.opis.gui.interfaces.CType; +import mcp.mobius.opis.gui.interfaces.WAlign; +import mcp.mobius.opis.gui.widgets.WidgetGeometry; +import mcp.mobius.opis.gui.widgets.tableview.ViewTable; +import net.minecraft.client.gui.GuiScreen; + +public class ScreenTickHandler extends ScreenBase { + + public ScreenTickHandler(GuiScreen parent, ArrayList stat) { + super(parent); + + ViewTable table = (ViewTable)this.getRoot().addWidget("Table", new ViewTable(null)); + + table.setGeometry(new WidgetGeometry(50.0, 50.0, 80.0, 80.0,CType.RELXY, CType.RELXY, WAlign.CENTER, WAlign.CENTER)); + + table.setColumnsAlign(WAlign.CENTER, WAlign.CENTER) + //.setColumnsTitle("\u00a7a\u00a7oType", "\u00a7a\u00a7oPos", "\u00a7a\u00a7oUpdate Time") + .setColumnsTitle("Name", "Update Time") + .setColumnsWidth(50,50) + .setRowColors(0xff808080, 0xff505050) + .setFontSize(1.0f); + + for (TickHandlerStats data : stat){ + + if(modOpis.microseconds) + table.addRow(data, + data.getName(), + String.format("%.3f \u00B5s",data.getGeometricMean())); + else + table.addRow(data, + data.getName(), + String.format("%.5f ms",data.getGeometricMean()/1000.0)); + } + + } + +} diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 7d8436b..065bb0d 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -49,7 +49,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; -@Mod(modid="Opis", name="Opis", version="1.1.2_alpha") +@Mod(modid="Opis", name="Opis", version="1.2.0_alpha") @NetworkMod(channels={"Opis", "Opis_Chunk"},clientSideRequired=false, serverSideRequired=false, connectionHandler=OpisConnectionHandler.class, packetHandler=OpisPacketHandler.class) public class modOpis { diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index 8030d6e..91dc7a5 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -36,6 +36,7 @@ public class DataReqHandler { } } else if (data[0].equals("list")){ + if (data[1].equals("chunk")){ if (data[2].equals("entities")){ PacketDispatcher.sendPacketToPlayer(Packet_DataListChunkEntities.create(EntityManager.getEntitiesInChunk(coord)), player); diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index 6819c37..55b6d25 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -29,6 +29,7 @@ import mcp.mobius.opis.network.server.Packet_DataListChunkEntities; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; import mcp.mobius.opis.network.server.Packet_DataScreenAmountEntities; import mcp.mobius.opis.network.server.Packet_DataScreenTimingEntities; +import mcp.mobius.opis.network.server.Packet_DataScreenTimingHandlers; import mcp.mobius.opis.network.server.Packet_LoadedChunks; import mcp.mobius.opis.network.server.Packet_MeanTime; import mcp.mobius.opis.network.server.Packet_ModMeanTime; @@ -143,6 +144,11 @@ public class OpisPacketHandler implements IPacketHandler { Packet_DataScreenAmountEntities castedPacket = new Packet_DataScreenAmountEntities(packet); modOpis.proxy.displayEntityAmount(castedPacket.entities); } + + else if (header == Packets.DATA_SCREEN_TIMING_HANDLERS){ + Packet_DataScreenTimingHandlers castedPacket = new Packet_DataScreenTimingHandlers(packet); + modOpis.proxy.displayHandlerList(castedPacket.stats); + } else if (header == Packets.CLR_SELECTION){ Packet_ClearSelection castedPacket = new Packet_ClearSelection(packet); diff --git a/mcp/mobius/opis/network/Packets.java b/mcp/mobius/opis/network/Packets.java index 90b8503..20cbbff 100644 --- a/mcp/mobius/opis/network/Packets.java +++ b/mcp/mobius/opis/network/Packets.java @@ -29,7 +29,8 @@ public class Packets { public static byte DATA_OVERLAY_CHUNK_ENTITIES = 0x40; public static byte DATA_LIST_CHUNK_ENTITIES = 0x41; public static byte DATA_SCREEN_TIMING_ENTITIES = 0x42; - public static byte DATA_SCREEN_AMOUNT_ENTITIES = 0x43; + public static byte DATA_SCREEN_AMOUNT_ENTITIES = 0x43; + public static byte DATA_SCREEN_TIMING_HANDLERS = 0x44; public static byte REQ_DATA = 0x50; // C => S diff --git a/mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java b/mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java new file mode 100644 index 0000000..ea47e1a --- /dev/null +++ b/mcp/mobius/opis/network/server/Packet_DataScreenTimingHandlers.java @@ -0,0 +1,52 @@ +package mcp.mobius.opis.network.server; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; + +import net.minecraft.network.packet.Packet250CustomPayload; +import mcp.mobius.opis.data.holders.TickHandlerStats; +import mcp.mobius.opis.network.Packet251Extended; +import mcp.mobius.opis.network.Packets; + +public class Packet_DataScreenTimingHandlers { + + + public byte header; + public ArrayList stats = new ArrayList(); + + public Packet_DataScreenTimingHandlers(Packet250CustomPayload packet) { + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + + try{ + this.header = inputStream.readByte(); + int ndata = inputStream.readInt(); + for (int i = 0; i < ndata; i++) + stats.add(TickHandlerStats.readFromStream(inputStream)); + } catch (IOException e){} + } + + public static Packet250CustomPayload create(ArrayList stats){ + Packet251Extended packet = new Packet251Extended(); + ByteArrayOutputStream bos = new ByteArrayOutputStream(1); + DataOutputStream outputStream = new DataOutputStream(bos); + + try{ + outputStream.writeByte(Packets.DATA_SCREEN_TIMING_HANDLERS); + outputStream.writeInt(stats.size()); + for (TickHandlerStats data : stats) + data.writeToStream(outputStream); + }catch(IOException e){} + + packet.channel = "Opis"; + packet.data = bos.toByteArray(); + packet.length = bos.size(); + + return packet; + } + + +} diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index c33238c..ffb419a 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -11,6 +11,7 @@ import mapwriter.api.MwAPI; import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.ChunkStats; import mcp.mobius.opis.data.holders.EntityStats; +import mcp.mobius.opis.data.holders.TickHandlerStats; import mcp.mobius.opis.data.holders.TileEntityStats; import mcp.mobius.opis.data.holders.ModStats; import mcp.mobius.opis.gui.font.Fonts; @@ -20,6 +21,7 @@ import mcp.mobius.opis.gui.screens.ScreenChunks; import mcp.mobius.opis.gui.screens.ScreenEntity; import mcp.mobius.opis.gui.screens.ScreenEntityAmount; import mcp.mobius.opis.gui.screens.ScreenMods; +import mcp.mobius.opis.gui.screens.ScreenTickHandler; import mcp.mobius.opis.gui.screens.ScreenTileEntity; import mcp.mobius.opis.overlay.OverlayLoadedChunks; import mcp.mobius.opis.overlay.OverlayMeanTime; @@ -59,6 +61,13 @@ public class ProxyClient extends ProxyServer { screenEnts.display(); } + @Override + public void displayHandlerList(ArrayList stats){ + ScreenBase screenHandlers = new ScreenTickHandler(null, stats); + screenHandlers.display(); + } + + @Override public void displayEntityAmount(HashMap stats){ ScreenBase screenEnts = new ScreenEntityAmount(null, stats); diff --git a/mcp/mobius/opis/proxy/ProxyServer.java b/mcp/mobius/opis/proxy/ProxyServer.java index f00b1e2..eed5dfd 100644 --- a/mcp/mobius/opis/proxy/ProxyServer.java +++ b/mcp/mobius/opis/proxy/ProxyServer.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.Player; import mcp.mobius.opis.data.holders.ChunkStats; import mcp.mobius.opis.data.holders.EntityStats; import mcp.mobius.opis.data.holders.ModStats; +import mcp.mobius.opis.data.holders.TickHandlerStats; import mcp.mobius.opis.data.holders.TileEntityStats; import mcp.mobius.opis.overlay.OverlayStatus; @@ -17,6 +18,7 @@ public class ProxyServer { public void init(){} public void displayTileEntityList(ArrayList stats){} public void displayEntityList(ArrayList stats){} + public void displayHandlerList(ArrayList stats){} public void displayChunkList(ArrayList stats){} public void displayModList(ArrayList stats){} public void displayEntityAmount(HashMap stats){}