Added Render tick profiler.

This commit is contained in:
ProfMobius committed 2014-04-13 22:16:58 +02:00
1 parent 1d74ffb001
commit 01bd453fbd
14 files changed
+234 -62

No files matched your search

@@ -44,7 +44,7 @@ public class CommandHandler extends CommandBase implements IOpisCommand {
return;
}
ArrayList<DataHandler> stats = TickHandlerManager.getCumulatedStats();
ArrayList<DataHandler> stats = TickHandlerManager.getCumulatedStatsServer();
for (DataHandler s : stats)
icommandsender.sendChatToPlayer(ChatMessageComponent.createFromText(String.format("%s : %.2f", s.name, s.update.toString())));
@@ -29,7 +29,7 @@ public class DataByteRate implements Comparable, ISerializable {
}
if (size >= (1024*1024)){
return String.format("%.3f GiB/s", this.size / 1024.0 / 1024.0 / this.interval);
return String.format("%.3f MiB/s", this.size / 1024.0 / 1024.0 / this.interval);
}
return String.format("%4d B/s", this.size / this.interval);
@@ -24,7 +24,7 @@ public class DataByteSize implements Comparable, ISerializable {
}
if (size >= (1024*1024)){
return String.format("%.3f GiB", this.size / 1024.0 / 1024.0);
return String.format("%.3f MiB", this.size / 1024.0 / 1024.0);
}
return String.format("%4d B", this.size);
@@ -8,22 +8,32 @@ import net.minecraft.network.packet.Packet;
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.managers.TickHandlerManager;
import mcp.mobius.opis.data.profilers.ProfilerHandlerServer;
import mcp.mobius.opis.data.profilers.ProfilerHandler;
import cpw.mods.fml.common.IScheduledTickHandler;
public class DataHandler implements ISerializable, Comparable {
public CachedString 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();
public DataHandler fillServer(IScheduledTickHandler ticker){
double timingPre = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.get(ticker).getGeometricMean();
double timingPost = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTOP.getProfiler())).dataServer.get(ticker).getGeometricMean();
this.update = new DataTiming(timingPre + timingPost);
this.name = new CachedString(TickHandlerManager.getHandlerName(ticker));
return this;
}
public DataHandler fillRender(IScheduledTickHandler ticker){
double timingPre = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataRender.get(ticker).getGeometricMean();
double timingPost = ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTOP.getProfiler())).dataRender.get(ticker).getGeometricMean();
this.update = new DataTiming(timingPre + timingPost);
this.name = new CachedString(TickHandlerManager.getHandlerName(ticker));
return this;
}
@Override
public void writeToStream(DataOutputStream stream) throws IOException {
@@ -10,7 +10,7 @@ import cpw.mods.fml.common.SingleIntervalHandler;
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
import mcp.mobius.opis.data.profilers.ProfilerHandlerServer;
import mcp.mobius.opis.data.profilers.ProfilerHandler;
public class TickHandlerManager {
@@ -30,15 +30,25 @@ public class TickHandlerManager {
}
}
public static ArrayList<DataHandler> getCumulatedStats(){
public static ArrayList<DataHandler> getCumulatedStatsServer(){
ArrayList<DataHandler> retVal = new ArrayList<DataHandler>();
for (IScheduledTickHandler ticker : ((ProfilerHandlerServer)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).data.keySet())
retVal.add(new DataHandler().fill(ticker));
for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.keySet())
retVal.add(new DataHandler().fillServer(ticker));
Collections.sort(retVal);
return retVal;
}
public static ArrayList<DataHandler> getCumulatedStatsRender(){
ArrayList<DataHandler> retVal = new ArrayList<DataHandler>();
for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataRender.keySet())
retVal.add(new DataHandler().fillRender(ticker));
Collections.sort(retVal);
return retVal;
}
public static String getHandlerName(IScheduledTickHandler handler){
String name = handler.getLabel();
@@ -70,8 +80,8 @@ public class TickHandlerManager {
public static DataTiming getTotalUpdateTime(){
double updateTime = 0D;
for (IScheduledTickHandler ticker : ((ProfilerHandlerServer)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).data.keySet())
updateTime += new DataHandler().fill(ticker).update.timing;
for (IScheduledTickHandler ticker : ((ProfilerHandler)(ProfilerSection.HANDLER_TICKSTART.getProfiler())).dataServer.keySet())
updateTime += new DataHandler().fillServer(ticker).update.timing;
return new DataTiming(updateTime);
}
@@ -0,0 +1,57 @@
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 ProfilerHandler extends ProfilerAbstract {
private Clock clockServer = new Clock();
private Clock clockRender = new Clock();
public WeakHashMap<IScheduledTickHandler, DescriptiveStatistics> dataServer = new WeakHashMap<IScheduledTickHandler, DescriptiveStatistics>();
public WeakHashMap<IScheduledTickHandler, DescriptiveStatistics> dataRender = new WeakHashMap<IScheduledTickHandler, DescriptiveStatistics>();
@Override
public void reset() {
}
@Override
public void start(Object key1, Object key2) {
IScheduledTickHandler ticker = (IScheduledTickHandler) key1;
EnumSet<TickType> ticksToRun = (EnumSet<TickType>) key2;
if (ticksToRun.contains(TickType.SERVER) && ticksToRun.size() == 1){
if (!dataServer.containsKey(ticker))
dataServer.put(ticker, new DescriptiveStatistics());
clockServer.start();
}
else if (ticksToRun.contains(TickType.RENDER) && ticksToRun.size() == 1){
if (!dataRender.containsKey(ticker))
dataRender.put(ticker, new DescriptiveStatistics());
clockRender.start();
}
}
@Override
public void stop(Object key1, Object key2) {
IScheduledTickHandler ticker = (IScheduledTickHandler) key1;
EnumSet<TickType> ticksToRun = (EnumSet<TickType>) key2;
if (ticksToRun.contains(TickType.SERVER) && ticksToRun.size() == 1){
clockServer.stop();
dataServer.get(ticker).addValue((double)clockServer.timeDelta);
}
else if (ticksToRun.contains(TickType.RENDER) && ticksToRun.size() == 1){
clockRender.stop();
dataRender.get(ticker).addValue((double)clockRender.timeDelta);
}
}
}
@@ -1,42 +0,0 @@
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<IScheduledTickHandler, DescriptiveStatistics> data = new WeakHashMap<IScheduledTickHandler, DescriptiveStatistics>();
@Override
public void reset() {
}
@Override
public void start(Object key1, Object key2) {
IScheduledTickHandler ticker = (IScheduledTickHandler) key1;
EnumSet<TickType> ticksToRun = (EnumSet<TickType>) 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<TickType> ticksToRun = (EnumSet<TickType>) key2;
if (!ticksToRun.contains(TickType.SERVER) || ticksToRun.size() != 1) return;
clock.stop();
data.get(ticker).addValue((double)clock.timeDelta);
}
}
@@ -15,7 +15,9 @@ import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock;
import mcp.mobius.opis.data.holders.basetypes.SerialLong;
import mcp.mobius.opis.data.holders.newtypes.DataBlockRender;
import mcp.mobius.opis.data.holders.newtypes.DataEntityRender;
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
import mcp.mobius.opis.data.holders.newtypes.DataTileEntityRender;
import mcp.mobius.opis.data.managers.TickHandlerManager;
import mcp.mobius.opis.data.profilers.ProfilerRenderBlock;
import mcp.mobius.opis.data.profilers.ProfilerRenderEntity;
import mcp.mobius.opis.data.profilers.ProfilerRenderTileEntity;
@@ -23,6 +25,7 @@ import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.client.Packet_ReqData;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderEntities;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderHandlers;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderTileEnts;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType;
@@ -56,10 +59,12 @@ public enum OpisClientTickHandler implements ITickHandler {
if (modOpis.profilerRunClient){
((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Running...");
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Running...");
((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).getBtnRunRender().setText("Running...");
}
else{
((PanelRenderTileEnts)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERTILEENTS))).getBtnRunRender().setText("Run Render");
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getBtnRunRender().setText("Run Render");
((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).getBtnRunRender().setText("Run Render");
}
profilerUpdateTickCounter++;
@@ -129,8 +134,11 @@ public enum OpisClientTickHandler implements ITickHandler {
Collections.sort(entData);
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).setTable(entData);
((PanelRenderEntities)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERENTITIES))).getLblTotal().setText(String.format("Total : %.3f µs", entTotal / 1000.0));
//====================================================================================
((PanelRenderHandlers)(TabPanelRegistrar.INSTANCE.getTab(SelectedTab.RENDERHANDLERS))).setTable(TickHandlerManager.getCumulatedStatsRender());
//====================================================================================
ArrayList<DataBlockRender> blockData = new ArrayList<DataBlockRender>();
for (CoordinatesBlock coord : ((ProfilerRenderBlock)ProfilerSection.RENDER_BLOCK.getProfiler()).data.keySet()){
+3 -3
View File
@@ -35,7 +35,7 @@ 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.ProfilerHandler;
import mcp.mobius.opis.data.profilers.ProfilerNetworkTick;
import mcp.mobius.opis.data.profilers.ProfilerPacket;
import mcp.mobius.opis.data.profilers.ProfilerRenderBlock;
@@ -170,8 +170,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());
ProfilerSection.HANDLER_TICKSTART .setProfiler(new ProfilerHandler());
ProfilerSection.HANDLER_TICKSTOP .setProfiler(new ProfilerHandler());
ProfilerSection.PACKET_INBOUND .setProfiler(new ProfilerPacket());
ProfilerSection.PACKET_OUTBOUND .setProfiler(new ProfilerPacket());
ProfilerSection.NETWORK_TICK .setProfiler(new ProfilerNetworkTick());
@@ -210,7 +210,7 @@ public class OpisPacketHandler implements IPacketHandler {
public static void sendFullUpdate(Player player){
ArrayList<DataEntity> timingEntities = EntityManager.INSTANCE.getWorses(100);
ArrayList<DataBlockTileEntity> timingTileEnts = TileEntityManager.INSTANCE.getWorses(100);
ArrayList<DataHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
ArrayList<DataHandler> timingHandlers = TickHandlerManager.getCumulatedStatsServer();
ArrayList<StatsChunk> timingChunks = ChunkManager.INSTANCE.getTopChunks(100);
DataTiming totalTimeTE = TileEntityManager.INSTANCE.getTotalUpdateTime();
@@ -102,7 +102,7 @@ public class ServerMessageHandler {
}
else if (maintype == Message.LIST_TIMING_HANDLERS){
ArrayList<DataHandler> timingHandlers = TickHandlerManager.getCumulatedStats();
ArrayList<DataHandler> timingHandlers = TickHandlerManager.getCumulatedStatsServer();
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);
+3 -1
View File
@@ -39,6 +39,7 @@ import mcp.mobius.opis.swing.panels.network.PanelInbound250;
import mcp.mobius.opis.swing.panels.network.PanelOutbound;
import mcp.mobius.opis.swing.panels.network.PanelOutbound250;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderEntities;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderHandlers;
import mcp.mobius.opis.swing.panels.timingclient.PanelRenderTileEnts;
import mcp.mobius.opis.swing.panels.timingserver.PanelTimingChunks;
import mcp.mobius.opis.swing.panels.timingserver.PanelTimingEntities;
@@ -87,6 +88,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
TabPanelRegistrar.INSTANCE.registerSection("Client timing");
TabPanelRegistrar.INSTANCE.registerTab(new PanelRenderTileEnts(),"[Render] TileEnts", "Client timing");
TabPanelRegistrar.INSTANCE.registerTab(new PanelRenderEntities(),"[Render] Entities", "Client timing");
TabPanelRegistrar.INSTANCE.registerTab(new PanelRenderHandlers(),"[Render] Handlers", "Client timing");
TabPanelRegistrar.INSTANCE.registerSection("Network");
IMessageHandler panelPacketsOut = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelOutbound(), "Outbound", "Network");
@@ -197,7 +199,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
}
case CLIENT_SHOW_RENDER_TICK:{
modOpis.log.log(Level.INFO, "=== RENDER TICK ===");
ArrayList<DataHandler> stats = TickHandlerManager.getCumulatedStats();
ArrayList<DataHandler> stats = TickHandlerManager.getCumulatedStatsServer();
for (DataHandler stat : stats){
System.out.printf("%s \n", stat);
}
+1
View File
@@ -18,6 +18,7 @@ public enum SelectedTab {
PACKETINBOUND250,
PACKETOUTBOUND250,
ORPHANTES,
RENDERHANDLERS,
ANY,
NONE;
}
@@ -0,0 +1,126 @@
package mcp.mobius.opis.swing.panels.timingclient;
import java.util.ArrayList;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import net.miginfocom.swing.MigLayout;
import mcp.mobius.opis.api.IMessageHandler;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.newtypes.DataEntityRender;
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
import mcp.mobius.opis.data.holders.newtypes.DataTiming;
import mcp.mobius.opis.network.enums.Message;
import mcp.mobius.opis.network.packets.server.NetDataRaw;
import mcp.mobius.opis.swing.SelectedTab;
import mcp.mobius.opis.swing.actions.ActionRunOpisClient;
import mcp.mobius.opis.swing.widgets.JTableStats;
import javax.swing.JLabel;
public class PanelRenderHandlers extends JPanel implements ITabPanel, IMessageHandler{
private JTableStats table;
private JButton btnRunRender;
/**
* Create the panel.
*/
public PanelRenderHandlers() {
setLayout(new MigLayout("", "[grow][grow][]", "[][grow][]"));
btnRunRender = new JButton("Run Render");
add(btnRunRender, "cell 2 0");
btnRunRender.addActionListener(new ActionRunOpisClient());
JScrollPane scrollPane = new JScrollPane();
add(scrollPane, "cell 0 1 3 1,grow");
table = new JTableStats();
table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
table.setModel(new DefaultTableModel(
new Object[][] {
},
new String[] {
"Name", "Update Time"
}
) {
Class[] columnTypes = new Class[] {
String.class, DataTiming.class
};
boolean[] columnEditables = new boolean[] {
false, false
};
@Override
public Class getColumnClass(int columnIndex) {
return columnTypes[columnIndex];
}
});
table.setAutoCreateRowSorter(true);
scrollPane.setViewportView(table);
DefaultTableCellRenderer centerRenderer = new DefaultTableCellRenderer();
centerRenderer.setHorizontalAlignment( SwingConstants.CENTER );
for (int i = 0; i < table.getColumnCount(); i++)
table.getColumnModel().getColumn(i).setCellRenderer(centerRenderer);
}
public void setTable(ArrayList<DataHandler> data){
DefaultTableModel model = (DefaultTableModel)table.getModel();
int row = this.updateData(table, model, DataHandler.class);
for (DataHandler o : data){
model.addRow(new Object[] {o.name, o.update});
}
this.dataUpdated(table, model, row);
}
public JTableStats getTable() {
return table;
}
public <U> int updateData(JTable table, DefaultTableModel model, Class<U> datatype){
int row = table.getSelectedRow();
if (model.getRowCount() > 0)
for (int i = model.getRowCount() - 1; i >= 0; i--)
model.removeRow(i);
return row;
}
public void dataUpdated(JTable table, DefaultTableModel model, int row){
model.fireTableDataChanged();
try{
table.setRowSelectionInterval(row, row);
} catch (IllegalArgumentException e ){
}
}
public JButton getBtnRunRender() {
return btnRunRender;
}
@Override
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
// TODO Auto-generated method stub
return false;
}
@Override
public SelectedTab getSelectedTab() {
return SelectedTab.RENDERHANDLERS;
}
}