Added tab for events timing.

This commit is contained in:
ProfMobius committed 2014-04-10 19:09:37 +02:00
1 parent 34fcf0840c
commit 2a0b37b3f8
9 files changed
+193 -11

No files matched your search

@@ -20,6 +20,7 @@ import mcp.mobius.opis.data.holders.newtypes.DataChunk;
import mcp.mobius.opis.data.holders.newtypes.DataDimension;
import mcp.mobius.opis.data.holders.newtypes.DataEntity;
import mcp.mobius.opis.data.holders.newtypes.DataEntityRender;
import mcp.mobius.opis.data.holders.newtypes.DataEvent;
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
import mcp.mobius.opis.data.holders.newtypes.DataNetworkTick;
import mcp.mobius.opis.data.holders.newtypes.DataPacket;
@@ -51,6 +52,7 @@ public enum DataType {
DATADIMENSION (DataDimension.class),
DATAENTITY (DataEntity.class),
DATAENTITYRENDER(DataEntityRender.class),
DATAEVENT (DataEvent.class),
DATAHANDLER (DataHandler.class),
DATANETWORKTICK (DataNetworkTick.class),
DATAPACKET (DataPacket.class),
@@ -0,0 +1,52 @@
package mcp.mobius.opis.data.holders.newtypes;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import com.google.common.collect.Table.Cell;
import net.minecraft.network.packet.Packet;
import mcp.mobius.opis.data.holders.ISerializable;
public class DataEvent implements ISerializable, Comparable {
public String event;
public String handler;
public DataTiming update;
public DataEvent fill(Cell<Class, Class, DescriptiveStatistics> cell){
String handlerName = cell.getColumnKey().getSimpleName();
try {
String[] splitHandler = handlerName.split("_");
handlerName = splitHandler[2] + "." + splitHandler[3];
} catch (Exception e){}
this.handler = handlerName;
this.event = cell.getRowKey().getName().replace("net.minecraftforge.event.", "");
this.update = new DataTiming(cell.getValue().getGeometricMean());
return this;
}
@Override
public void writeToStream(DataOutputStream stream) throws IOException {
Packet.writeString(this.event, stream);
Packet.writeString(this.handler, stream);
this.update.writeToStream(stream);
}
public static DataEvent readFromStream(DataInputStream stream) throws IOException {
DataEvent retVal = new DataEvent();
retVal.event = Packet.readString(stream, 255);
retVal.handler = Packet.readString(stream, 255);
retVal.update = DataTiming.readFromStream(stream);
return retVal;
}
@Override
public int compareTo(Object o) {
return this.update.compareTo(((DataHandler)o).update);
}
}
@@ -153,17 +153,7 @@ public enum OpisServerTickHandler implements ITickHandler {
OpisPacketHandler.sendFullUpdate(player);
}
System.out.printf("================================================\n");
HashBasedTable<Class, Class, DescriptiveStatistics> eventData = ((ProfilerEvent)ProfilerSection.EVENT_INVOKE.getProfiler()).data;
for (Cell<Class, Class, DescriptiveStatistics> cell : eventData.cellSet()){
String handlerName = cell.getColumnKey().getSimpleName();
try {
String[] splitHandler = handlerName.split("_");
handlerName = splitHandler[2] + "." + splitHandler[3];
} catch (Exception e){}
System.out.printf("%-50s %-50s %.3f µs\n",cell.getRowKey().getName().replace("net.minecraftforge.event.", ""), handlerName, cell.getValue().getGeometricMean()/1000.);
}
}
}
@@ -8,6 +8,11 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.logging.Level;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Table.Cell;
import mapwriter.Mw;
import mcp.mobius.mobiuscore.profiler.ProfilerSection;
import mcp.mobius.opis.modOpis;
@@ -23,6 +28,7 @@ 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.DataEvent;
import mcp.mobius.opis.data.holders.newtypes.DataHandler;
import mcp.mobius.opis.data.holders.newtypes.DataNetworkTick;
import mcp.mobius.opis.data.holders.newtypes.DataTileEntity;
@@ -32,6 +38,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.events.PlayerTracker;
import mcp.mobius.opis.gui.overlay.OverlayLoadedChunks;
import mcp.mobius.opis.gui.overlay.OverlayMeanTime;
@@ -212,11 +219,17 @@ public class OpisPacketHandler implements IPacketHandler {
DataNetworkTick totalNetwork = new DataNetworkTick().fill();
DataBlockTick totalWorldTick = new DataBlockTick().fill();
ArrayList<DataEvent> timingEvents = new ArrayList<DataEvent>();
HashBasedTable<Class, Class, DescriptiveStatistics> eventData = ((ProfilerEvent)ProfilerSection.EVENT_INVOKE.getProfiler()).data;
for (Cell<Class, Class, DescriptiveStatistics> cell : eventData.cellSet()){
timingEvents.add(new DataEvent().fill(cell));
}
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_HANDLERS, timingHandlers), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_ENTITIES, timingEntities), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_TILEENTS, timingTileEnts), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_CHUNK, timingChunks), player);
OpisPacketHandler.validateAndSend(NetDataList.create(Message.LIST_TIMING_EVENTS, timingEvents), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_TILEENTS, totalTimeTE), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_ENTITIES, totalTimeEnt), player);
OpisPacketHandler.validateAndSend(NetDataValue.create(Message.VALUE_TIMING_HANDLERS, totalTimeHandler), player);
@@ -19,6 +19,7 @@ public enum Message {
LIST_TIMING_ENTITIES,
LIST_TIMING_HANDLERS,
LIST_TIMING_CHUNK,
LIST_TIMING_EVENTS,
LIST_AMOUNT_ENTITIES,
LIST_PLAYERS (EnumSet.of(SelectedTab.PLAYERS)),
LIST_DIMENSION_DATA (EnumSet.of(SelectedTab.DIMENSIONS)),
+7
View File
@@ -40,6 +40,7 @@ import mcp.mobius.opis.swing.panels.PanelRenderTileEnts;
import mcp.mobius.opis.swing.panels.PanelSummary;
import mcp.mobius.opis.swing.panels.PanelTimingChunks;
import mcp.mobius.opis.swing.panels.PanelTimingEntities;
import mcp.mobius.opis.swing.panels.PanelTimingEvents;
import mcp.mobius.opis.swing.panels.PanelTimingHandlers;
import mcp.mobius.opis.swing.panels.PanelTimingTileEnts;
@@ -76,6 +77,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
IMessageHandler panelTimingEntities = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingEntities(),"Entities", "Server timing");
IMessageHandler panelTimingHandlers = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingHandlers(),"Handlers", "Server timing");
IMessageHandler panelTimingChunks = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingChunks(), "Chunks", "Server timing");
IMessageHandler panelTimingEvents = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingEvents(), "Events", "Server timing");
IMessageHandler panelDimensions = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelDimensions(), "Dimensions", "Tracking");
IMessageHandler panelPackets = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelPackets(), "Network");
@@ -108,6 +110,11 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingChunks);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingChunks);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingChunks);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_TIMING_EVENTS, panelTimingEvents);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_START, panelTimingEvents);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_STOP, panelTimingEvents);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_RUNNING, panelTimingEvents);
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_ACCESS_LEVEL, DataCache.instance());
MessageHandlerRegistrar.INSTANCE.registerHandler(Message.STATUS_CURRENT_TIME, DataCache.instance());
+1
View File
@@ -12,6 +12,7 @@ public enum SelectedTab {
TIMINGENTITES,
TIMINGHANDLERS,
TIMINGTILEENTS,
TIMINGEVENTS,
ANY,
NONE;
}
+9
View File
@@ -8,6 +8,8 @@ import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.ToolTipManager;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.WindowConstants;
import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent;
@@ -69,6 +71,7 @@ public class SwingUI extends JFrame implements WindowListener, ChangeListener, I
* Create the frame.
*/
private SwingUI() {
setTitle("Opis Control Panel");
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
setBounds(100, 100, 893, 455);
@@ -130,6 +133,12 @@ public class SwingUI extends JFrame implements WindowListener, ChangeListener, I
break;
}
case CLIENT_SHOW_SWING:{
/*
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Exception e) {}
*/
modOpis.swingOpen = true;
this.showUI();
Minecraft.getMinecraft().displayGuiScreen(new GuiChat());
@@ -0,0 +1,107 @@
package mcp.mobius.opis.swing.panels;
import javax.swing.JPanel;
import mcp.mobius.opis.api.ITabPanel;
import mcp.mobius.opis.data.holders.newtypes.DataEvent;
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.ActionRunOpis;
import mcp.mobius.opis.swing.widgets.JPanelMsgHandler;
import mcp.mobius.opis.swing.widgets.JTableStats;
import net.miginfocom.swing.MigLayout;
import javax.swing.JButton;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.table.DefaultTableModel;
public class PanelTimingEvents extends JPanelMsgHandler implements ITabPanel {
private JButton btnRun;
public PanelTimingEvents() {
setLayout(new MigLayout("", "[grow][]", "[][grow]"));
btnRun = new JButton("Run Opis");
add(btnRun, "cell 1 0");
btnRun.addActionListener(new ActionRunOpis());
JScrollPane scrollPane = new JScrollPane();
add(scrollPane, "cell 0 1 2 1,grow");
table = new JTableStats();
table.setModel(new DefaultTableModel(
new Object[][] {
{null, null, null},
},
new String[] {
"Event", "Handler", "Timing"
}
) {
Class[] columnTypes = new Class[] {
String.class, String.class, DataTiming.class
};
public Class getColumnClass(int columnIndex) {
return columnTypes[columnIndex];
}
});
table.setAutoCreateRowSorter(true);
scrollPane.setViewportView(table);
}
@Override
public boolean handleMessage(Message msg, NetDataRaw rawdata) {
switch(msg){
case LIST_TIMING_EVENTS:{
((JTableStats)this.getTable()).setTableData(rawdata.array);
DefaultTableModel model = (DefaultTableModel)table.getModel();
int row = this.updateData(table, model, DataEvent.class);
for (Object o : rawdata.array){
DataEvent data = (DataEvent)o;
model.addRow(new Object[] {data.event, data.handler, data.update});
}
this.dataUpdated(table, model, row);
break;
}
case STATUS_START:{
this.getBtnRun().setText("Running...");
break;
}
case STATUS_STOP:{
this.getBtnRun().setText("Run Opis");
break;
}
case STATUS_RUNNING:{
this.getBtnRun().setText("Running...");
break;
}
default:
return false;
}
return true;
}
@Override
public String getTabRefName() {
return "opis.events";
}
@Override
public SelectedTab getSelectedTab() {
return SelectedTab.TIMINGEVENTS;
}
public JButton getBtnRun() {
return btnRun;
}
}