Added Tick profiler, display on the summary page and display of a graph.

This commit is contained in:
ProfMobius committed 2014-03-20 04:30:15 +01:00
1 parent c167190ae0
commit a76a19425e
11 files changed
+211 -17

No files matched your search

@@ -9,7 +9,7 @@ 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.EntityProfiler;
import mcp.mobius.opis.data.server.TickHandlerProfiler;
import mcp.mobius.opis.data.server.HandlerProfiler;
import mcp.mobius.opis.data.server.TileEntityProfiler;
import mcp.mobius.opis.server.OpisServerTickHandler;
import mcp.mobius.opis.server.PlayerTracker;
@@ -1,10 +1,29 @@
package mcp.mobius.opis.data.client;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import java.util.HashMap;
import javax.swing.ImageIcon;
import javax.swing.table.DefaultTableModel;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.axis.NumberAxis;
import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.plot.XYPlot;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.xy.DefaultTableXYDataset;
import org.jfree.data.xy.DefaultXYDataset;
import org.jfree.data.xy.XYBarDataset;
import org.jfree.data.xy.XYDataset;
import org.jfree.data.xy.XYSeries;
import org.jfree.data.xy.XYSeriesCollection;
import codechicken.lib.math.MathHelper;
import net.minecraft.item.ItemStack;
import mcp.mobius.opis.data.holders.AmountHolder;
import mcp.mobius.opis.data.holders.ChunkStats;
@@ -12,6 +31,7 @@ import mcp.mobius.opis.data.holders.EntityStats;
import mcp.mobius.opis.data.holders.ISerializable;
import mcp.mobius.opis.data.holders.StatAbstract;
import mcp.mobius.opis.data.holders.TickHandlerStats;
import mcp.mobius.opis.data.holders.TickStats;
import mcp.mobius.opis.data.holders.TileEntityStats;
import mcp.mobius.opis.gui.swing.SwingUI;
import mcp.mobius.opis.tools.ModIdentification;
@@ -35,6 +55,10 @@ public class DataCache {
private int amountEntitiesTotal = 0;
private int amountTileEntsTotal = 0;
private TickStats timingTick = new TickStats();
private ArrayList<Double> timingTickGraphData = new ArrayList<Double>();
//private DescriptiveStatistics timingTickGraphData = new DescriptiveStatistics(100);
public void setTimingHandlersTotal(double value){
this.timingHandlersTotal = value;
SwingUI.instance().getLblSummaryTimingHandlers().setText(String.format("%.3f", value/1000.));
@@ -67,6 +91,47 @@ public class DataCache {
SwingUI.instance().getLblSummaryAmountTileEnts().setText(String.valueOf(value));
}
public void setTimingTick(ISerializable tickStat){
this.timingTick = (TickStats)tickStat;
SwingUI.instance().getLblSummaryTimingTick().setText(String.valueOf(String.format("%.3f", this.timingTick.getGeometricMean()/1000.)));
if (timingTickGraphData.size() > 100)
timingTickGraphData.remove(0);
timingTickGraphData.add(this.timingTick.getGeometricMean()/1000.);
//timingTickGraphData.addValue(this.timingTick.getGeometricMean()/1000.);
XYSeries xyData = new XYSeries("Update time");
double maxValue = 0D;
for (int i = 0; i < timingTickGraphData.size(); i++){
xyData.add(i, timingTickGraphData.get(i));
}
/*
double[] values = this.timingTickGraphData.getValues();
for (int i = 0; i < values.length; i++)
xyData.add(i, values[i]);
*/
XYSeriesCollection dataset = new XYSeriesCollection();
dataset.addSeries(xyData);
//JFreeChart chart = ChartFactory.createXYLineChart("", "Seconds", "Update Time [ms]", dataset, PlotOrientation.VERTICAL, false, false, false);
JFreeChart chart = ChartFactory.createXYAreaChart("", "Ticks * 20", "Update Time [ms]", dataset, PlotOrientation.VERTICAL, false, false, false);
chart.setBackgroundPaint(new Color(0,255,255,255));
XYPlot xyPlot = chart.getXYPlot();
xyPlot.getRendererForDataset(dataset).setSeriesPaint(0, Color.BLUE);
((NumberAxis)xyPlot.getRangeAxis()).setRange(0.0, 50.0 * (MathHelper.floor_double(xyData.getMaxY() / 50.0D) + 1));
Dimension dim = SwingUI.instance().getLblSummaryTickChart().getSize();
//System.out.printf("%s %s\n", dim.height, dim.width);
BufferedImage image = chart.createBufferedImage(dim.width,dim.height);
SwingUI.instance().getLblSummaryTickChart().setIcon(new ImageIcon(image));
}
public ArrayList<AmountHolder> getAmountEntities(){
return this.amountEntities;
@@ -2,7 +2,7 @@ package mcp.mobius.opis.data.client;
import java.util.EnumSet;
import mcp.mobius.mobiuscore.profiler.IProfilerTick;
import mcp.mobius.mobiuscore.profiler.IProfilerHandler;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.client.OpisClientTickHandler;
import mcp.mobius.opis.data.managers.TickHandlerManager;
@@ -10,7 +10,7 @@ import mcp.mobius.opis.server.OpisServerTickHandler;
import cpw.mods.fml.common.IScheduledTickHandler;
import cpw.mods.fml.common.TickType;
public class TickHandlerClientProfiler implements IProfilerTick {
public class TickHandlerClientProfiler implements IProfilerHandler {
public class Clock{
public long startTime = 0;
@@ -0,0 +1,23 @@
package mcp.mobius.opis.data.holders;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
public class TickStats extends StatAbstract {
public DescriptiveStatistics dstat = new DescriptiveStatistics(20);
@Override
public void writeToStream(DataOutputStream stream) throws IOException {
stream.writeDouble(this.getGeometricMean());
}
public static TickStats readFromStream(DataInputStream stream) throws IOException {
TickStats stat = new TickStats();
stat.setGeometricMean(stream.readDouble());
return stat;
}
}
@@ -4,12 +4,12 @@ import java.util.EnumSet;
import cpw.mods.fml.common.IScheduledTickHandler;
import cpw.mods.fml.common.TickType;
import mcp.mobius.mobiuscore.profiler.IProfilerTick;
import mcp.mobius.mobiuscore.profiler.IProfilerHandler;
import mcp.mobius.opis.modOpis;
import mcp.mobius.opis.data.managers.TickHandlerManager;
import mcp.mobius.opis.server.OpisServerTickHandler;
public class TickHandlerProfiler implements IProfilerTick {
public class HandlerProfiler implements IProfilerHandler {
public class Clock{
public long startTime = 0;
@@ -0,0 +1,34 @@
package mcp.mobius.opis.data.server;
import mcp.mobius.mobiuscore.profiler.IProfilerTick;
import mcp.mobius.opis.data.holders.TickStats;
public class TickProfiler implements IProfilerTick {
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 static TickProfiler _instance = new TickProfiler();
public static TickProfiler instance() {return _instance;}
private Clock clock = new Clock();
public TickStats stats = new TickStats();
public int profiledTicks = 0;
@Override
public void TickStart() {
this.clock.start();
}
@Override
public void TickEnd() {
this.clock.stop();
this.stats.addMeasure(this.clock.timeDelta);
this.profiledTicks += 1;
}
}
+65 -8
View File
@@ -118,6 +118,12 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
private JButton btnSummaryReset;
private JButton btnTimingEntKillTarget;
private JButton btnAmountKillAll;
private JLabel lblSummary_11;
private JLabel lblSummary_12;
private JLabel lblSummaryTimingTick;
private JSeparator separator_3;
private JSeparator separator_4;
private JLabel lblSummaryTickChart;
public void showUI(){
EventQueue.invokeLater(new Runnable() {
@@ -150,9 +156,9 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
tabbedPane.addTab("Summary", null, panelSummary, null);
GridBagLayout gbl_panelSummary = new GridBagLayout();
gbl_panelSummary.columnWidths = new int[]{0, 50, 0, 70, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0};
gbl_panelSummary.rowHeights = new int[]{0, -4, 0, 0, 0, 0, 0, 0};
gbl_panelSummary.rowHeights = new int[]{0, -4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
gbl_panelSummary.columnWeights = new double[]{0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, Double.MIN_VALUE};
gbl_panelSummary.rowWeights = new double[]{0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Double.MIN_VALUE};
gbl_panelSummary.rowWeights = new double[]{0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, Double.MIN_VALUE};
panelSummary.setLayout(gbl_panelSummary);
btnSummaryReset = new JButton("Reset");
@@ -166,7 +172,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
separator_1 = new JSeparator();
GridBagConstraints gbc_separator_1 = new GridBagConstraints();
gbc_separator_1.gridheight = 6;
gbc_separator_1.insets = new Insets(0, 0, 0, 5);
gbc_separator_1.insets = new Insets(0, 0, 5, 5);
gbc_separator_1.gridx = 2;
gbc_separator_1.gridy = 1;
panelSummary.add(separator_1, gbc_separator_1);
@@ -183,7 +189,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
separator_2 = new JSeparator();
GridBagConstraints gbc_separator_2 = new GridBagConstraints();
gbc_separator_2.gridheight = 6;
gbc_separator_2.insets = new Insets(0, 0, 0, 5);
gbc_separator_2.insets = new Insets(0, 0, 5, 5);
gbc_separator_2.gridx = 5;
gbc_separator_2.gridy = 1;
panelSummary.add(separator_2, gbc_separator_2);
@@ -297,7 +303,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
lblSummary_6 = new JLabel("Total");
GridBagConstraints gbc_lblSummary_6 = new GridBagConstraints();
gbc_lblSummary_6.insets = new Insets(0, 0, 0, 5);
gbc_lblSummary_6.insets = new Insets(0, 0, 5, 5);
gbc_lblSummary_6.gridx = 1;
gbc_lblSummary_6.gridy = 6;
panelSummary.add(lblSummary_6, gbc_lblSummary_6);
@@ -305,18 +311,63 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
lblSummaryTimingTotal = new JLabel("0");
GridBagConstraints gbc_lblSummaryTimingTotal = new GridBagConstraints();
gbc_lblSummaryTimingTotal.anchor = GridBagConstraints.EAST;
gbc_lblSummaryTimingTotal.insets = new Insets(0, 0, 0, 5);
gbc_lblSummaryTimingTotal.insets = new Insets(0, 0, 5, 5);
gbc_lblSummaryTimingTotal.gridx = 3;
gbc_lblSummaryTimingTotal.gridy = 6;
panelSummary.add(lblSummaryTimingTotal, gbc_lblSummaryTimingTotal);
lblSummary_10 = new JLabel("ms");
GridBagConstraints gbc_lblSummary_10 = new GridBagConstraints();
gbc_lblSummary_10.insets = new Insets(0, 0, 0, 5);
gbc_lblSummary_10.insets = new Insets(0, 0, 5, 5);
gbc_lblSummary_10.gridx = 4;
gbc_lblSummary_10.gridy = 6;
panelSummary.add(lblSummary_10, gbc_lblSummary_10);
separator_3 = new JSeparator();
GridBagConstraints gbc_separator_3 = new GridBagConstraints();
gbc_separator_3.insets = new Insets(0, 0, 5, 5);
gbc_separator_3.gridx = 0;
gbc_separator_3.gridy = 7;
panelSummary.add(separator_3, gbc_separator_3);
separator_4 = new JSeparator();
GridBagConstraints gbc_separator_4 = new GridBagConstraints();
gbc_separator_4.insets = new Insets(0, 0, 5, 5);
gbc_separator_4.gridx = 0;
gbc_separator_4.gridy = 8;
panelSummary.add(separator_4, gbc_separator_4);
lblSummary_11 = new JLabel("Tick Time");
GridBagConstraints gbc_lblSummary_11 = new GridBagConstraints();
gbc_lblSummary_11.insets = new Insets(0, 0, 5, 5);
gbc_lblSummary_11.gridx = 1;
gbc_lblSummary_11.gridy = 9;
panelSummary.add(lblSummary_11, gbc_lblSummary_11);
lblSummaryTimingTick = new JLabel("0");
GridBagConstraints gbc_lblSummaryTimingTick = new GridBagConstraints();
gbc_lblSummaryTimingTick.anchor = GridBagConstraints.LINE_END;
gbc_lblSummaryTimingTick.insets = new Insets(0, 0, 5, 5);
gbc_lblSummaryTimingTick.gridx = 3;
gbc_lblSummaryTimingTick.gridy = 9;
panelSummary.add(lblSummaryTimingTick, gbc_lblSummaryTimingTick);
lblSummary_12 = new JLabel("ms");
GridBagConstraints gbc_lblSummary_12 = new GridBagConstraints();
gbc_lblSummary_12.insets = new Insets(0, 0, 5, 5);
gbc_lblSummary_12.gridx = 4;
gbc_lblSummary_12.gridy = 9;
panelSummary.add(lblSummary_12, gbc_lblSummary_12);
lblSummaryTickChart = new JLabel("");
GridBagConstraints gbc_lblSummaryTickChart = new GridBagConstraints();
gbc_lblSummaryTickChart.fill = GridBagConstraints.BOTH;
gbc_lblSummaryTickChart.gridwidth = 18;
gbc_lblSummaryTickChart.insets = new Insets(0, 0, 0, 5);
gbc_lblSummaryTickChart.gridx = 1;
gbc_lblSummaryTickChart.gridy = 11;
panelSummary.add(lblSummaryTickChart, gbc_lblSummaryTickChart);
panelEntityAmount = new JPanel();
tabbedPane.addTab("Entity Amount", null, panelEntityAmount, null);
GridBagLayout gbl_panelEntityAmount = new GridBagLayout();
@@ -520,6 +571,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
panelTimingEnt.add(btnTimingEntRefresh, gbc_btnTimingEntRefresh);
btnTimingEntKillTarget = new JButton("Kill Target");
btnTimingEntKillTarget.setEnabled(false);
GridBagConstraints gbc_btnTimingEntKillTarget = new GridBagConstraints();
gbc_btnTimingEntKillTarget.insets = new Insets(0, 0, 5, 5);
gbc_btnTimingEntKillTarget.gridx = 2;
@@ -746,7 +798,12 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{
public JLabel getLblSummaryTimingTotal() {
return lblSummaryTimingTotal;
}
public JLabel getLblSummaryTimingTick() {
return lblSummaryTimingTick;
}
public JLabel getLblSummaryTickChart() {
return lblSummaryTickChart;
}
@Override
public void actionPerformed(ActionEvent e) {
+4 -2
View File
@@ -32,7 +32,8 @@ import mcp.mobius.opis.commands.server.CommandTimingTileEntities;
import mcp.mobius.opis.data.client.TickHandlerClientProfiler;
import mcp.mobius.opis.data.holders.CoordinatesBlock;
import mcp.mobius.opis.data.server.EntityProfiler;
import mcp.mobius.opis.data.server.TickHandlerProfiler;
import mcp.mobius.opis.data.server.HandlerProfiler;
import mcp.mobius.opis.data.server.TickProfiler;
import mcp.mobius.opis.data.server.TileEntityProfiler;
import mcp.mobius.opis.network.OpisConnectionHandler;
import mcp.mobius.opis.network.OpisPacketHandler;
@@ -104,7 +105,8 @@ public class modOpis {
} else {
ProfilerRegistrar.registerProfilerTileEntity(new TileEntityProfiler());
ProfilerRegistrar.registerProfilerEntity(new EntityProfiler());
ProfilerRegistrar.registerProfilerTick(new TickHandlerProfiler());
ProfilerRegistrar.registerProfilerHandler(new HandlerProfiler());
ProfilerRegistrar.registerProfilerTick(TickProfiler.instance());
}
}
@@ -163,7 +163,10 @@ public class OpisPacketHandler implements IPacketHandler {
DataCache.instance().setAmountEntitiesTotal(((SerialInt)castedPacket.data).value);
else if ((castedPacket.maintype == DataReq.VALUE) && (castedPacket.subtype == DataReq.AMOUNT) && (castedPacket.target == DataReq.HANDLERS))
DataCache.instance().setAmountHandlersTotal(((SerialInt)castedPacket.data).value);
DataCache.instance().setAmountHandlersTotal(((SerialInt)castedPacket.data).value);
else if ((castedPacket.maintype == DataReq.VALUE) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.TICK))
DataCache.instance().setTimingTick(castedPacket.data);
}
}
+2 -1
View File
@@ -30,7 +30,8 @@ public enum DataReq {
TRUE("true"),
FALSE("false"),
LOADED("loaded"),
TICKETS("tickets");
TICKETS("tickets"),
TICK("tick");
private String text;
@@ -21,6 +21,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.server.TickProfiler;
import mcp.mobius.opis.network.enums.DataReq;
import mcp.mobius.opis.network.server.Packet_DataList;
import mcp.mobius.opis.network.server.Packet_DataValue;
@@ -53,6 +54,14 @@ public class OpisServerTickHandler implements ITickHandler {
@Override
public void tickEnd(EnumSet<TickType> type, Object... tickData) {
if(type.contains(TickType.SERVER)){
if ((TickProfiler.instance().profiledTicks % 20) == 0){
TickProfiler.instance().profiledTicks = 0;
for (EntityPlayer player : PlayerTracker.instance().playersSwing){
PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.TICK, TickProfiler.instance().stats), (Player)player);
}
}
clientUpdateTickCounter++;
if (clientUpdateTickCounter % 100 == 0){
updatePlayers();