diff --git a/mcp/mobius/opis/data/client/DataCache.java b/mcp/mobius/opis/data/client/DataCache.java index 087beaa..266264c 100644 --- a/mcp/mobius/opis/data/client/DataCache.java +++ b/mcp/mobius/opis/data/client/DataCache.java @@ -50,6 +50,7 @@ public class DataCache { private double timingHandlersTotal = 0D; private double timingEntitiesTotal = 0D; private double timingTileEntsTotal = 0D; + private double timingWorldTickTotal= 0D; private int amountHandlersTotal = 0; private int amountEntitiesTotal = 0; @@ -58,24 +59,34 @@ public class DataCache { private TickStats timingTick = new TickStats(); private ArrayList timingTickGraphData = new ArrayList(); //private DescriptiveStatistics timingTickGraphData = new DescriptiveStatistics(100); + + private double getProfiledTickTotalTime(){ + return (timingWorldTickTotal + this.timingHandlersTotal + this.timingEntitiesTotal + this.timingTileEntsTotal)/1000.; + } + + public void setTimingWorldTickTotal(double value){ + this.timingWorldTickTotal = value; + SwingUI.instance().getLblSummaryTimingWorldTick().setText(String.format("%.3f", value/1000.)); + SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f", this.getProfiledTickTotalTime() )); + } public void setTimingHandlersTotal(double value){ this.timingHandlersTotal = value; SwingUI.instance().getLblSummaryTimingHandlers().setText(String.format("%.3f", value/1000.)); SwingUI.instance().getLblTimingHandlerValue().setText(String.format("Total update time : %.3f µs", value)); - SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f", (this.timingHandlersTotal + this.timingEntitiesTotal + this.timingTileEntsTotal)/1000.)); + SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f",this.getProfiledTickTotalTime())); } public void setTimingEntitiesTotal(double value){ this.timingEntitiesTotal = value; SwingUI.instance().getLblSummaryTimingEntities().setText(String.format("%.3f", value/1000.)); SwingUI.instance().getLblTimingEntValue().setText(String.format("Total update time : %.3f µs", value)); - SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f", (this.timingHandlersTotal + this.timingEntitiesTotal + this.timingTileEntsTotal)/1000.)); + SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f",this.getProfiledTickTotalTime())); } public void setTimingTileEntsTotal(double value){ this.timingTileEntsTotal = value; SwingUI.instance().getLblSummaryTimingTileEnts().setText(String.format("%.3f", value/1000.)); SwingUI.instance().getLblTimingTEValue().setText(String.format("Total update time : %.3f µs", value)); - SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f", (this.timingHandlersTotal + this.timingEntitiesTotal + this.timingTileEntsTotal)/1000.)); + SwingUI.instance().getLblSummaryTimingTotal().setText(String.format("%.3f",this.getProfiledTickTotalTime())); } public void setAmountHandlersTotal(int value){ @@ -120,7 +131,7 @@ public class DataCache { //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)); + chart.setBackgroundPaint(new Color(255,255,255,0)); 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)); diff --git a/mcp/mobius/opis/data/holders/WorldTickStats.java b/mcp/mobius/opis/data/holders/WorldTickStats.java new file mode 100644 index 0000000..6cbfd4d --- /dev/null +++ b/mcp/mobius/opis/data/holders/WorldTickStats.java @@ -0,0 +1,20 @@ +package mcp.mobius.opis.data.holders; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +public class WorldTickStats extends StatAbstract implements ISerializable { + + @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; + } + +} diff --git a/mcp/mobius/opis/data/managers/MetaManager.java b/mcp/mobius/opis/data/managers/MetaManager.java index 759ed20..c961153 100644 --- a/mcp/mobius/opis/data/managers/MetaManager.java +++ b/mcp/mobius/opis/data/managers/MetaManager.java @@ -2,6 +2,7 @@ package mcp.mobius.opis.data.managers; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.data.server.WorldTickProfiler; import mcp.mobius.opis.server.OpisServerTickHandler; public class MetaManager { @@ -15,6 +16,7 @@ public class MetaManager { EntityManager.stats.clear(); TickHandlerManager.startStats.clear(); TickHandlerManager.endStats.clear(); + WorldTickProfiler.instance().stats.dstat.clear(); ProfilerRegistrar.turnOff(); } diff --git a/mcp/mobius/opis/data/server/AbstractProfiler.java b/mcp/mobius/opis/data/server/AbstractProfiler.java new file mode 100644 index 0000000..e9998a5 --- /dev/null +++ b/mcp/mobius/opis/data/server/AbstractProfiler.java @@ -0,0 +1,13 @@ +package mcp.mobius.opis.data.server; + +public class AbstractProfiler { + + 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;} + } + protected Clock clock = new Clock(); + +} diff --git a/mcp/mobius/opis/data/server/EntityProfiler.java b/mcp/mobius/opis/data/server/EntityProfiler.java index 4c63aeb..da9c1f5 100644 --- a/mcp/mobius/opis/data/server/EntityProfiler.java +++ b/mcp/mobius/opis/data/server/EntityProfiler.java @@ -8,17 +8,9 @@ import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.managers.EntityManager; import mcp.mobius.opis.server.OpisServerTickHandler; -public class EntityProfiler implements IProfilerEntity { +public class EntityProfiler extends AbstractProfiler implements IProfilerEntity { - 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 Entity currentEntity = null; - private Clock clock = new Clock(); @Override public void FullEntityStart() {} diff --git a/mcp/mobius/opis/data/server/HandlerProfiler.java b/mcp/mobius/opis/data/server/HandlerProfiler.java index 0ed6b7f..00816aa 100644 --- a/mcp/mobius/opis/data/server/HandlerProfiler.java +++ b/mcp/mobius/opis/data/server/HandlerProfiler.java @@ -9,17 +9,9 @@ import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.server.OpisServerTickHandler; -public class HandlerProfiler implements IProfilerHandler { - - 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;} - } +public class HandlerProfiler extends AbstractProfiler implements IProfilerHandler { private String currentHandler = null; - private Clock clock = new Clock(); @Override public void StartTickStart(IScheduledTickHandler ticker, EnumSet ticksToRun) { diff --git a/mcp/mobius/opis/data/server/TickProfiler.java b/mcp/mobius/opis/data/server/TickProfiler.java index ef7349d..ee4b630 100644 --- a/mcp/mobius/opis/data/server/TickProfiler.java +++ b/mcp/mobius/opis/data/server/TickProfiler.java @@ -3,15 +3,8 @@ 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 TickProfiler extends AbstractProfiler 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;} diff --git a/mcp/mobius/opis/data/server/TileEntityProfiler.java b/mcp/mobius/opis/data/server/TileEntityProfiler.java index 8ee241b..ee9d7c0 100644 --- a/mcp/mobius/opis/data/server/TileEntityProfiler.java +++ b/mcp/mobius/opis/data/server/TileEntityProfiler.java @@ -9,17 +9,9 @@ import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.server.OpisServerTickHandler; -public class TileEntityProfiler implements IProfilerTileEntity { +public class TileEntityProfiler extends AbstractProfiler implements IProfilerTileEntity { - 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 TileEntity currentEntity = null; - private Clock clock = new Clock(); @Override public void FullTileEntityStart() { } diff --git a/mcp/mobius/opis/data/server/WorldTickProfiler.java b/mcp/mobius/opis/data/server/WorldTickProfiler.java new file mode 100644 index 0000000..6f69e90 --- /dev/null +++ b/mcp/mobius/opis/data/server/WorldTickProfiler.java @@ -0,0 +1,24 @@ +package mcp.mobius.opis.data.server; + +import mcp.mobius.mobiuscore.profiler.IProfilerWorldTick; +import mcp.mobius.opis.data.holders.WorldTickStats; + +public class WorldTickProfiler extends AbstractProfiler implements IProfilerWorldTick { + + private static WorldTickProfiler _instance = new WorldTickProfiler(); + public static WorldTickProfiler instance() {return _instance;} + public WorldTickStats stats = new WorldTickStats(); + + @Override + public void WorldTickStart() { + this.clock.start(); + + } + + @Override + public void WorldTickEnd() { + this.clock.stop(); + this.stats.addMeasure(this.clock.timeDelta); + } + +} diff --git a/mcp/mobius/opis/gui/swing/SwingUI.java b/mcp/mobius/opis/gui/swing/SwingUI.java index 833dd91..3120856 100644 --- a/mcp/mobius/opis/gui/swing/SwingUI.java +++ b/mcp/mobius/opis/gui/swing/SwingUI.java @@ -124,6 +124,10 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ private JSeparator separator_3; private JSeparator separator_4; private JLabel lblSummaryTickChart; + private JSeparator separator_5; + private JLabel lblSummary_13; + private JLabel lblSummaryTimingWorldTick; + private JLabel lblSummary_14; public void showUI(){ EventQueue.invokeLater(new Runnable() { @@ -156,22 +160,21 @@ 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, 0, 0, 0, 0, 0}; + gbl_panelSummary.rowHeights = new int[]{0, -4, 0, 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, 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, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, Double.MIN_VALUE}; panelSummary.setLayout(gbl_panelSummary); - btnSummaryReset = new JButton("Reset"); - GridBagConstraints gbc_btnSummaryReset = new GridBagConstraints(); - gbc_btnSummaryReset.insets = new Insets(0, 0, 5, 0); - gbc_btnSummaryReset.gridx = 18; - gbc_btnSummaryReset.gridy = 0; - btnSummaryReset.addActionListener(this); - panelSummary.add(btnSummaryReset, gbc_btnSummaryReset); + separator_5 = new JSeparator(); + GridBagConstraints gbc_separator_5 = new GridBagConstraints(); + gbc_separator_5.insets = new Insets(0, 0, 5, 5); + gbc_separator_5.gridx = 1; + gbc_separator_5.gridy = 0; + panelSummary.add(separator_5, gbc_separator_5); separator_1 = new JSeparator(); GridBagConstraints gbc_separator_1 = new GridBagConstraints(); - gbc_separator_1.gridheight = 6; + gbc_separator_1.gridheight = 7; gbc_separator_1.insets = new Insets(0, 0, 5, 5); gbc_separator_1.gridx = 2; gbc_separator_1.gridy = 1; @@ -188,7 +191,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.gridheight = 7; gbc_separator_2.insets = new Insets(0, 0, 5, 5); gbc_separator_2.gridx = 5; gbc_separator_2.gridy = 1; @@ -202,11 +205,43 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_label.gridy = 1; panelSummary.add(label, gbc_label); + btnSummaryReset = new JButton("Reset"); + GridBagConstraints gbc_btnSummaryReset = new GridBagConstraints(); + gbc_btnSummaryReset.insets = new Insets(0, 0, 5, 0); + gbc_btnSummaryReset.gridx = 18; + gbc_btnSummaryReset.gridy = 1; + btnSummaryReset.addActionListener(this); + panelSummary.add(btnSummaryReset, gbc_btnSummaryReset); + + lblSummary_13 = new JLabel("World Tick"); + GridBagConstraints gbc_lblSummary_13 = new GridBagConstraints(); + gbc_lblSummary_13.anchor = GridBagConstraints.LINE_START; + gbc_lblSummary_13.insets = new Insets(0, 0, 5, 5); + gbc_lblSummary_13.gridx = 1; + gbc_lblSummary_13.gridy = 2; + panelSummary.add(lblSummary_13, gbc_lblSummary_13); + + lblSummaryTimingWorldTick = new JLabel("0"); + GridBagConstraints gbc_lblSummaryTimingWorldTick = new GridBagConstraints(); + gbc_lblSummaryTimingWorldTick.anchor = GridBagConstraints.LINE_END; + gbc_lblSummaryTimingWorldTick.insets = new Insets(0, 0, 5, 5); + gbc_lblSummaryTimingWorldTick.gridx = 3; + gbc_lblSummaryTimingWorldTick.gridy = 2; + panelSummary.add(lblSummaryTimingWorldTick, gbc_lblSummaryTimingWorldTick); + + lblSummary_14 = new JLabel("ms"); + GridBagConstraints gbc_lblSummary_14 = new GridBagConstraints(); + gbc_lblSummary_14.insets = new Insets(0, 0, 5, 5); + gbc_lblSummary_14.gridx = 4; + gbc_lblSummary_14.gridy = 2; + panelSummary.add(lblSummary_14, gbc_lblSummary_14); + lblSummary_3 = new JLabel("Tile Entities"); GridBagConstraints gbc_lblSummary_3 = new GridBagConstraints(); + gbc_lblSummary_3.anchor = GridBagConstraints.LINE_START; gbc_lblSummary_3.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_3.gridx = 1; - gbc_lblSummary_3.gridy = 2; + gbc_lblSummary_3.gridy = 3; panelSummary.add(lblSummary_3, gbc_lblSummary_3); lblSummaryTimingTileEnts = new JLabel("0"); @@ -215,14 +250,14 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryTimingTileEnts.anchor = GridBagConstraints.EAST; gbc_lblSummaryTimingTileEnts.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryTimingTileEnts.gridx = 3; - gbc_lblSummaryTimingTileEnts.gridy = 2; + gbc_lblSummaryTimingTileEnts.gridy = 3; panelSummary.add(lblSummaryTimingTileEnts, gbc_lblSummaryTimingTileEnts); lblSummary_7 = new JLabel("ms"); GridBagConstraints gbc_lblSummary_7 = new GridBagConstraints(); gbc_lblSummary_7.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_7.gridx = 4; - gbc_lblSummary_7.gridy = 2; + gbc_lblSummary_7.gridy = 3; panelSummary.add(lblSummary_7, gbc_lblSummary_7); lblSummaryAmountTileEnts = new JLabel("0"); @@ -230,14 +265,15 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryAmountTileEnts.anchor = GridBagConstraints.LINE_END; gbc_lblSummaryAmountTileEnts.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryAmountTileEnts.gridx = 6; - gbc_lblSummaryAmountTileEnts.gridy = 2; + gbc_lblSummaryAmountTileEnts.gridy = 3; panelSummary.add(lblSummaryAmountTileEnts, gbc_lblSummaryAmountTileEnts); lblSummary_4 = new JLabel("Entities"); GridBagConstraints gbc_lblSummary_4 = new GridBagConstraints(); + gbc_lblSummary_4.anchor = GridBagConstraints.WEST; gbc_lblSummary_4.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_4.gridx = 1; - gbc_lblSummary_4.gridy = 3; + gbc_lblSummary_4.gridy = 4; panelSummary.add(lblSummary_4, gbc_lblSummary_4); lblSummaryTimingEntities = new JLabel("0"); @@ -245,14 +281,14 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryTimingEntities.anchor = GridBagConstraints.EAST; gbc_lblSummaryTimingEntities.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryTimingEntities.gridx = 3; - gbc_lblSummaryTimingEntities.gridy = 3; + gbc_lblSummaryTimingEntities.gridy = 4; panelSummary.add(lblSummaryTimingEntities, gbc_lblSummaryTimingEntities); lblSummary_8 = new JLabel("ms"); GridBagConstraints gbc_lblSummary_8 = new GridBagConstraints(); gbc_lblSummary_8.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_8.gridx = 4; - gbc_lblSummary_8.gridy = 3; + gbc_lblSummary_8.gridy = 4; panelSummary.add(lblSummary_8, gbc_lblSummary_8); lblSummaryAmountEntities = new JLabel("0"); @@ -260,14 +296,15 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryAmountEntities.anchor = GridBagConstraints.LINE_END; gbc_lblSummaryAmountEntities.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryAmountEntities.gridx = 6; - gbc_lblSummaryAmountEntities.gridy = 3; + gbc_lblSummaryAmountEntities.gridy = 4; panelSummary.add(lblSummaryAmountEntities, gbc_lblSummaryAmountEntities); lblSummary_5 = new JLabel("Handlers"); GridBagConstraints gbc_lblSummary_5 = new GridBagConstraints(); + gbc_lblSummary_5.anchor = GridBagConstraints.WEST; gbc_lblSummary_5.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_5.gridx = 1; - gbc_lblSummary_5.gridy = 4; + gbc_lblSummary_5.gridy = 5; panelSummary.add(lblSummary_5, gbc_lblSummary_5); lblSummaryTimingHandlers = new JLabel("0"); @@ -275,14 +312,14 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryTimingHandlers.anchor = GridBagConstraints.EAST; gbc_lblSummaryTimingHandlers.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryTimingHandlers.gridx = 3; - gbc_lblSummaryTimingHandlers.gridy = 4; + gbc_lblSummaryTimingHandlers.gridy = 5; panelSummary.add(lblSummaryTimingHandlers, gbc_lblSummaryTimingHandlers); lblSummary_9 = new JLabel("ms"); GridBagConstraints gbc_lblSummary_9 = new GridBagConstraints(); gbc_lblSummary_9.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_9.gridx = 4; - gbc_lblSummary_9.gridy = 4; + gbc_lblSummary_9.gridy = 5; panelSummary.add(lblSummary_9, gbc_lblSummary_9); lblSummaryAmountHandlers = new JLabel("0"); @@ -290,7 +327,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryAmountHandlers.anchor = GridBagConstraints.LINE_END; gbc_lblSummaryAmountHandlers.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryAmountHandlers.gridx = 6; - gbc_lblSummaryAmountHandlers.gridy = 4; + gbc_lblSummaryAmountHandlers.gridy = 5; panelSummary.add(lblSummaryAmountHandlers, gbc_lblSummaryAmountHandlers); separator = new JSeparator(); @@ -298,14 +335,15 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_separator.gridwidth = 4; gbc_separator.insets = new Insets(0, 0, 5, 5); gbc_separator.gridx = 1; - gbc_separator.gridy = 5; + gbc_separator.gridy = 6; panelSummary.add(separator, gbc_separator); lblSummary_6 = new JLabel("Total"); GridBagConstraints gbc_lblSummary_6 = new GridBagConstraints(); + gbc_lblSummary_6.anchor = GridBagConstraints.WEST; gbc_lblSummary_6.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_6.gridx = 1; - gbc_lblSummary_6.gridy = 6; + gbc_lblSummary_6.gridy = 7; panelSummary.add(lblSummary_6, gbc_lblSummary_6); lblSummaryTimingTotal = new JLabel("0"); @@ -313,35 +351,36 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryTimingTotal.anchor = GridBagConstraints.EAST; gbc_lblSummaryTimingTotal.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryTimingTotal.gridx = 3; - gbc_lblSummaryTimingTotal.gridy = 6; + gbc_lblSummaryTimingTotal.gridy = 7; panelSummary.add(lblSummaryTimingTotal, gbc_lblSummaryTimingTotal); lblSummary_10 = new JLabel("ms"); GridBagConstraints gbc_lblSummary_10 = new GridBagConstraints(); gbc_lblSummary_10.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_10.gridx = 4; - gbc_lblSummary_10.gridy = 6; + gbc_lblSummary_10.gridy = 7; 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; + gbc_separator_3.gridy = 8; 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; + gbc_separator_4.gridy = 9; panelSummary.add(separator_4, gbc_separator_4); lblSummary_11 = new JLabel("Tick Time"); GridBagConstraints gbc_lblSummary_11 = new GridBagConstraints(); + gbc_lblSummary_11.anchor = GridBagConstraints.WEST; gbc_lblSummary_11.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_11.gridx = 1; - gbc_lblSummary_11.gridy = 9; + gbc_lblSummary_11.gridy = 10; panelSummary.add(lblSummary_11, gbc_lblSummary_11); lblSummaryTimingTick = new JLabel("0"); @@ -349,23 +388,22 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryTimingTick.anchor = GridBagConstraints.LINE_END; gbc_lblSummaryTimingTick.insets = new Insets(0, 0, 5, 5); gbc_lblSummaryTimingTick.gridx = 3; - gbc_lblSummaryTimingTick.gridy = 9; + gbc_lblSummaryTimingTick.gridy = 10; 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; + gbc_lblSummary_12.gridy = 10; 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; + gbc_lblSummaryTickChart.gridy = 12; panelSummary.add(lblSummaryTickChart, gbc_lblSummaryTickChart); panelEntityAmount = new JPanel(); @@ -804,6 +842,9 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ public JLabel getLblSummaryTickChart() { return lblSummaryTickChart; } + public JLabel getLblSummaryTimingWorldTick() { + return lblSummaryTimingWorldTick; + } @Override public void actionPerformed(ActionEvent e) { @@ -888,4 +929,5 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.AMOUNT, DataReq.ENTITIES)); } + } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index f278006..f4ba39f 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -33,6 +33,7 @@ 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.HandlerProfiler; +import mcp.mobius.opis.data.server.WorldTickProfiler; import mcp.mobius.opis.data.server.TickProfiler; import mcp.mobius.opis.data.server.TileEntityProfiler; import mcp.mobius.opis.network.OpisConnectionHandler; @@ -106,6 +107,7 @@ public class modOpis { ProfilerRegistrar.registerProfilerTileEntity(new TileEntityProfiler()); ProfilerRegistrar.registerProfilerEntity(new EntityProfiler()); ProfilerRegistrar.registerProfilerHandler(new HandlerProfiler()); + ProfilerRegistrar.registerProfilerWorldTick(WorldTickProfiler.instance()); ProfilerRegistrar.registerProfilerTick(TickProfiler.instance()); } diff --git a/mcp/mobius/opis/network/ClientCommandHandler.java b/mcp/mobius/opis/network/ClientCommandHandler.java index 341780f..b95af27 100644 --- a/mcp/mobius/opis/network/ClientCommandHandler.java +++ b/mcp/mobius/opis/network/ClientCommandHandler.java @@ -48,11 +48,12 @@ public class ClientCommandHandler { } else if (cmd == ClientCommand.SHOW_SWING){ - PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.TILETENTS)); - PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.ENTITIES)); - PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.HANDLERS)); - PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.CHUNK)); - PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.AMOUNT, DataReq.ENTITIES)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.TILETENTS)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.ENTITIES)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.HANDLERS)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.TIMING, DataReq.CHUNK)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.VALUE, DataReq.TIMING, DataReq.WORLDTICK)); + PacketDispatcher.sendPacketToServer(Packet_ReqData.create(DataReq.LIST, DataReq.AMOUNT, DataReq.ENTITIES)); SwingUI.instance().showUI(); } diff --git a/mcp/mobius/opis/network/DataReqHandler.java b/mcp/mobius/opis/network/DataReqHandler.java index fb7bc5f..996f681 100644 --- a/mcp/mobius/opis/network/DataReqHandler.java +++ b/mcp/mobius/opis/network/DataReqHandler.java @@ -28,6 +28,7 @@ import mcp.mobius.opis.data.managers.EntityManager; 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.WorldTickProfiler; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; import mcp.mobius.opis.network.server.Packet_DataOverlayChunkEntities; @@ -105,6 +106,10 @@ public class DataReqHandler { ArrayList timingChunks = ChunkManager.getTopChunks(100); PacketDispatcher.sendPacketToPlayer(Packet_DataList.create(DataReq.LIST, DataReq.TIMING, DataReq.CHUNK, timingChunks), (Player)player); } + + else if ((maintype == DataReq.VALUE) && (subtype == DataReq.TIMING) && (target == DataReq.WORLDTICK)){ + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.WORLDTICK, new SerialDouble(WorldTickProfiler.instance().stats.getGeometricMean())), (Player)player); + } else if ((maintype == DataReq.LIST) && (subtype == DataReq.AMOUNT) && (target == DataReq.ENTITIES)){ boolean filtered = false; diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index f7c6910..b949541 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -155,6 +155,9 @@ public class OpisPacketHandler implements IPacketHandler { else if ((castedPacket.maintype == DataReq.VALUE) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.HANDLERS)) DataCache.instance().setTimingHandlersTotal(((SerialDouble)castedPacket.data).value); + + else if ((castedPacket.maintype == DataReq.VALUE) && (castedPacket.subtype == DataReq.TIMING) && (castedPacket.target == DataReq.WORLDTICK)) + DataCache.instance().setTimingWorldTickTotal(((SerialDouble)castedPacket.data).value); else if ((castedPacket.maintype == DataReq.VALUE) && (castedPacket.subtype == DataReq.AMOUNT) && (castedPacket.target == DataReq.TILETENTS)) DataCache.instance().setAmountTileEntsTotal(((SerialInt)castedPacket.data).value); diff --git a/mcp/mobius/opis/network/enums/DataReq.java b/mcp/mobius/opis/network/enums/DataReq.java index ad1f7db..6d535f2 100644 --- a/mcp/mobius/opis/network/enums/DataReq.java +++ b/mcp/mobius/opis/network/enums/DataReq.java @@ -31,7 +31,8 @@ public enum DataReq { FALSE("false"), LOADED("loaded"), TICKETS("tickets"), - TICK("tick"); + TICK("tick"), + WORLDTICK("worldtick"); private String text; diff --git a/mcp/mobius/opis/server/OpisServerTickHandler.java b/mcp/mobius/opis/server/OpisServerTickHandler.java index 8223598..d0ecf4f 100644 --- a/mcp/mobius/opis/server/OpisServerTickHandler.java +++ b/mcp/mobius/opis/server/OpisServerTickHandler.java @@ -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.WorldTickProfiler; import mcp.mobius.opis.data.server.TickProfiler; import mcp.mobius.opis.network.enums.DataReq; import mcp.mobius.opis.network.server.Packet_DataList; @@ -86,7 +87,7 @@ public class OpisServerTickHandler implements ITickHandler { SerialDouble totalTimeTE = new SerialDouble(TileEntityManager.getTotalUpdateTime()); SerialDouble totalTimeEnt = new SerialDouble(EntityManager.getTotalUpdateTime()); SerialDouble totalTimeHandler = new SerialDouble(TickHandlerManager.getTotalUpdateTime()); - + SerialDouble totalSubtick = new SerialDouble(WorldTickProfiler.instance().stats.getGeometricMean()); for (EntityPlayer player : PlayerTracker.instance().playersSwing){ @@ -107,6 +108,7 @@ public class OpisServerTickHandler implements ITickHandler { PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.TILETENTS, totalTimeTE), (Player)player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.ENTITIES, totalTimeEnt), (Player)player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.HANDLERS, totalTimeHandler),(Player)player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.WORLDTICK, totalSubtick),(Player)player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.AMOUNT, DataReq.TILETENTS, new SerialInt(TileEntityManager.stats.size())), (Player)player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.AMOUNT, DataReq.ENTITIES, new SerialInt(EntityManager.stats.size())), (Player)player);