From d03b4bc1f1a1efedf7cb7e4b6a3dfac70f05959b Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Fri, 21 Mar 2014 13:56:35 +0100 Subject: [PATCH] Added basic Packet profiling (UP/DOWN) --- mcp/mobius/opis/data/client/DataCache.java | 15 + .../opis/data/holders/stats/StatsTick.java | 2 +- .../opis/data/server/PacketProfiler.java | 26 ++ mcp/mobius/opis/data/server/TickProfiler.java | 4 +- mcp/mobius/opis/gui/swing/SwingUI.java | 277 +++++++++++------- mcp/mobius/opis/modOpis.java | 2 + .../opis/network/OpisPacketHandler.java | 9 +- mcp/mobius/opis/network/enums/DataReq.java | 4 +- .../opis/server/OpisServerTickHandler.java | 17 +- 9 files changed, 243 insertions(+), 113 deletions(-) create mode 100644 mcp/mobius/opis/data/server/PacketProfiler.java diff --git a/mcp/mobius/opis/data/client/DataCache.java b/mcp/mobius/opis/data/client/DataCache.java index e99fc5a..46eec6c 100644 --- a/mcp/mobius/opis/data/client/DataCache.java +++ b/mcp/mobius/opis/data/client/DataCache.java @@ -57,10 +57,25 @@ public class DataCache { private int amountEntitiesTotal = 0; private int amountTileEntsTotal = 0; + private long amountUpload = 0; + private long amountDownload = 0; + private StatsTick timingTick = new StatsTick(); private ArrayList timingTickGraphData = new ArrayList(); //private DescriptiveStatistics timingTickGraphData = new DescriptiveStatistics(100); + public void setAmountUpload(long value){ + this.amountUpload = value; + double uploadKB = (value / 8.0) / 1024.0; + SwingUI.instance().getLblSummaryUpload().setText(String.format("%.3f", uploadKB)); + } + + public void setAmountDownload(long value){ + this.amountDownload = value; + double downloadKB = (value / 8.0) / 1024.0; + SwingUI.instance().getLblSummaryDownload().setText(String.format("%.3f", downloadKB)); + } + private double getProfiledTickTotalTime(){ return (timingWorldTickTotal + this.timingHandlersTotal + timingTileEntsTotal + timingEntitiesTotal)/1000.; } diff --git a/mcp/mobius/opis/data/holders/stats/StatsTick.java b/mcp/mobius/opis/data/holders/stats/StatsTick.java index e4b5a2e..ab51adf 100644 --- a/mcp/mobius/opis/data/holders/stats/StatsTick.java +++ b/mcp/mobius/opis/data/holders/stats/StatsTick.java @@ -8,7 +8,7 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics; public class StatsTick extends StatAbstract { - public DescriptiveStatistics dstat = new DescriptiveStatistics(20); + public DescriptiveStatistics dstat = new DescriptiveStatistics(30); @Override public void writeToStream(DataOutputStream stream) throws IOException { diff --git a/mcp/mobius/opis/data/server/PacketProfiler.java b/mcp/mobius/opis/data/server/PacketProfiler.java new file mode 100644 index 0000000..532f1ef --- /dev/null +++ b/mcp/mobius/opis/data/server/PacketProfiler.java @@ -0,0 +1,26 @@ +package mcp.mobius.opis.data.server; + +import net.minecraft.network.packet.Packet; +import mcp.mobius.mobiuscore.profiler.IProfilerPacket; + +public class PacketProfiler implements IProfilerPacket { + + private static PacketProfiler _instance = new PacketProfiler(); + public static PacketProfiler instance() {return _instance;} + + public long dataSizeOut = 0; + public long dataSizeIn = 0; + + @Override + public void addPacketOut(Packet packet) { + if (packet != null) + dataSizeOut += packet.getPacketSize(); + } + + @Override + public void addPacketIn(Packet packet) { + if (packet != null) + dataSizeIn += packet.getPacketSize(); + } + +} diff --git a/mcp/mobius/opis/data/server/TickProfiler.java b/mcp/mobius/opis/data/server/TickProfiler.java index 48c126c..c218fff 100644 --- a/mcp/mobius/opis/data/server/TickProfiler.java +++ b/mcp/mobius/opis/data/server/TickProfiler.java @@ -10,7 +10,7 @@ public class TickProfiler extends AbstractProfiler implements IProfilerTick { private Clock clock = new Clock(); public StatsTick stats = new StatsTick(); - public int profiledTicks = 0; + //public int profiledTicks = 0; @Override public void TickStart() { @@ -21,7 +21,7 @@ public class TickProfiler extends AbstractProfiler implements IProfilerTick { public void TickEnd() { this.clock.stop(); this.stats.addMeasure(this.clock.timeDelta); - this.profiledTicks += 1; + //this.profiledTicks += 1; } } diff --git a/mcp/mobius/opis/gui/swing/SwingUI.java b/mcp/mobius/opis/gui/swing/SwingUI.java index d941a26..79d5e27 100644 --- a/mcp/mobius/opis/gui/swing/SwingUI.java +++ b/mcp/mobius/opis/gui/swing/SwingUI.java @@ -122,6 +122,13 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ private JLabel lblSummary_13; private JLabel lblSummaryTimingWorldTick; private JLabel lblSummary_14; + private JLabel lblNewLabel; + private JLabel lblSummary_15; + private JLabel lblSummaryDownload; + private JLabel lblSummaryUpload; + private JLabel lblNewLabel_4; + private JLabel lblNewLabel_5; + private JLabel lblNewLabel_6; public void showUI(){ EventQueue.invokeLater(new Runnable() { @@ -141,7 +148,7 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ private SwingUI() { setTitle("Opis Control Panel"); setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - setBounds(100, 100, 745, 413); + setBounds(100, 100, 838, 449); contentPane = new JPanel(); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); contentPane.setLayout(new BorderLayout(0, 0)); @@ -150,121 +157,24 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); contentPane.add(tabbedPane, BorderLayout.CENTER); - panelEntityAmount = new JPanel(); - tabbedPane.addTab("Entity Amount", null, panelEntityAmount, null); - GridBagLayout gbl_panelEntityAmount = new GridBagLayout(); - gbl_panelEntityAmount.columnWidths = new int[]{217, 407, 217, 0}; - gbl_panelEntityAmount.rowHeights = new int[]{0, 402, 30, 0}; - gbl_panelEntityAmount.columnWeights = new double[]{0.0, 0.0, 1.0, Double.MIN_VALUE}; - gbl_panelEntityAmount.rowWeights = new double[]{0.0, 1.0, 0.0, Double.MIN_VALUE}; - panelEntityAmount.setLayout(gbl_panelEntityAmount); - - chkBoxDisplayAll = new JCheckBox("Filter Entities"); - GridBagConstraints gbc_chkBoxDisplayAll = new GridBagConstraints(); - gbc_chkBoxDisplayAll.anchor = GridBagConstraints.WEST; - gbc_chkBoxDisplayAll.insets = new Insets(0, 0, 5, 5); - gbc_chkBoxDisplayAll.gridx = 0; - gbc_chkBoxDisplayAll.gridy = 0; - chkBoxDisplayAll.addItemListener(this); - panelEntityAmount.add(chkBoxDisplayAll, gbc_chkBoxDisplayAll); - - btnRefreshEntityAmount = new JButton("Refresh"); - GridBagConstraints gbc_btnRefreshEntityAmount = new GridBagConstraints(); - gbc_btnRefreshEntityAmount.anchor = GridBagConstraints.EAST; - gbc_btnRefreshEntityAmount.insets = new Insets(0, 0, 5, 0); - gbc_btnRefreshEntityAmount.gridx = 2; - gbc_btnRefreshEntityAmount.gridy = 0; - btnRefreshEntityAmount.addActionListener(this); - - btnAmountKillAll = new JButton("Kill All"); - btnAmountKillAll.addActionListener(this); - GridBagConstraints gbc_btnAmountKillAll = new GridBagConstraints(); - gbc_btnAmountKillAll.anchor = GridBagConstraints.EAST; - gbc_btnAmountKillAll.insets = new Insets(0, 0, 5, 5); - gbc_btnAmountKillAll.gridx = 1; - gbc_btnAmountKillAll.gridy = 0; - panelEntityAmount.add(btnAmountKillAll, gbc_btnAmountKillAll); - panelEntityAmount.add(btnRefreshEntityAmount, gbc_btnRefreshEntityAmount); - - scrollPaneEntityAmount = new JScrollPane(); - GridBagConstraints gbc_scrollPaneEntityAmount = new GridBagConstraints(); - gbc_scrollPaneEntityAmount.gridwidth = 3; - gbc_scrollPaneEntityAmount.fill = GridBagConstraints.BOTH; - gbc_scrollPaneEntityAmount.insets = new Insets(0, 0, 5, 0); - gbc_scrollPaneEntityAmount.gridx = 0; - gbc_scrollPaneEntityAmount.gridy = 1; - panelEntityAmount.add(scrollPaneEntityAmount, gbc_scrollPaneEntityAmount); - - tableEntityList = new JTable(); - tableEntityList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - tableEntityList.setModel(new DefaultTableModel( - new Object[][] { - {null, null}, - }, - new String[] { - "Type", "Amount" - } - ) { - Class[] columnTypes = new Class[] { - String.class, Integer.class - }; - public Class getColumnClass(int columnIndex) { - return columnTypes[columnIndex]; - } - boolean[] columnEditables = new boolean[] { - false, false - }; - public boolean isCellEditable(int row, int column) { - return columnEditables[column]; - } - }); - tableEntityList.getColumnModel().getColumn(0).setPreferredWidth(231); - tableEntityList.getColumnModel().getColumn(1).setPreferredWidth(237); - tableEntityList.setAutoCreateRowSorter(true); - scrollPaneEntityAmount.setViewportView(tableEntityList); - - labelAmountTotal = new JLabel("Total"); - labelAmountTotal.setHorizontalAlignment(SwingConstants.CENTER); - GridBagConstraints gbc_labelAmountTotal = new GridBagConstraints(); - gbc_labelAmountTotal.fill = GridBagConstraints.BOTH; - gbc_labelAmountTotal.insets = new Insets(0, 0, 0, 5); - gbc_labelAmountTotal.gridx = 0; - gbc_labelAmountTotal.gridy = 2; - panelEntityAmount.add(labelAmountTotal, gbc_labelAmountTotal); - - labelAmountValue = new JLabel("0"); - labelAmountValue.setHorizontalAlignment(SwingConstants.CENTER); - GridBagConstraints gbc_labelAmountValue = new GridBagConstraints(); - gbc_labelAmountValue.fill = GridBagConstraints.BOTH; - gbc_labelAmountValue.gridx = 2; - gbc_labelAmountValue.gridy = 2; - panelEntityAmount.add(labelAmountValue, gbc_labelAmountValue); - panelSummary = new JPanel(); tabbedPane.addTab("Summary", null, panelSummary, null); GridBagLayout gbl_panelSummary = new GridBagLayout(); - gbl_panelSummary.columnWidths = new int[]{0, 50, 20, 0, 70, 0, 20, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0}; + gbl_panelSummary.columnWidths = new int[]{0, 50, 20, 0, 70, 0, 20, 50, 50, 0, 20, 70, 0, 0, 60, 0, 0}; gbl_panelSummary.rowHeights = new int[]{0, -4, 0, 0, 0, 0, 20, 10, 30, 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.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, 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); lblSummary_1 = new JLabel("Update time"); GridBagConstraints gbc_lblSummary_1 = new GridBagConstraints(); - gbc_lblSummary_1.anchor = GridBagConstraints.WEST; + gbc_lblSummary_1.anchor = GridBagConstraints.EAST; gbc_lblSummary_1.gridwidth = 2; gbc_lblSummary_1.insets = new Insets(0, 0, 5, 5); gbc_lblSummary_1.gridx = 4; gbc_lblSummary_1.gridy = 1; panelSummary.add(lblSummary_1, gbc_lblSummary_1); - 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); - label = new JLabel("Amount"); GridBagConstraints gbc_label = new GridBagConstraints(); gbc_label.anchor = GridBagConstraints.LINE_END; @@ -272,6 +182,23 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_label.gridx = 7; gbc_label.gridy = 1; panelSummary.add(label, gbc_label); + + lblNewLabel_6 = new JLabel("Amount"); + GridBagConstraints gbc_lblNewLabel_6 = new GridBagConstraints(); + gbc_lblNewLabel_6.anchor = GridBagConstraints.EAST; + gbc_lblNewLabel_6.gridwidth = 2; + gbc_lblNewLabel_6.insets = new Insets(0, 0, 5, 5); + gbc_lblNewLabel_6.gridx = 11; + gbc_lblNewLabel_6.gridy = 1; + panelSummary.add(lblNewLabel_6, gbc_lblNewLabel_6); + + btnSummaryReset = new JButton("Refresh"); + GridBagConstraints gbc_btnSummaryReset = new GridBagConstraints(); + gbc_btnSummaryReset.anchor = GridBagConstraints.EAST; + gbc_btnSummaryReset.insets = new Insets(0, 0, 5, 0); + gbc_btnSummaryReset.gridx = 15; + gbc_btnSummaryReset.gridy = 1; + btnSummaryReset.addActionListener(this); panelSummary.add(btnSummaryReset, gbc_btnSummaryReset); lblSummary_13 = new JLabel("World Tick"); @@ -298,6 +225,29 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummary_14.gridy = 2; panelSummary.add(lblSummary_14, gbc_lblSummary_14); + lblNewLabel = new JLabel("Upload"); + GridBagConstraints gbc_lblNewLabel = new GridBagConstraints(); + gbc_lblNewLabel.anchor = GridBagConstraints.WEST; + gbc_lblNewLabel.insets = new Insets(0, 0, 5, 5); + gbc_lblNewLabel.gridx = 9; + gbc_lblNewLabel.gridy = 2; + panelSummary.add(lblNewLabel, gbc_lblNewLabel); + + lblSummaryUpload = new JLabel("0"); + GridBagConstraints gbc_lblSummaryUpload = new GridBagConstraints(); + gbc_lblSummaryUpload.anchor = GridBagConstraints.EAST; + gbc_lblSummaryUpload.insets = new Insets(0, 0, 5, 5); + gbc_lblSummaryUpload.gridx = 11; + gbc_lblSummaryUpload.gridy = 2; + panelSummary.add(lblSummaryUpload, gbc_lblSummaryUpload); + + lblNewLabel_4 = new JLabel("kB/s"); + GridBagConstraints gbc_lblNewLabel_4 = new GridBagConstraints(); + gbc_lblNewLabel_4.insets = new Insets(0, 0, 5, 5); + gbc_lblNewLabel_4.gridx = 12; + gbc_lblNewLabel_4.gridy = 2; + panelSummary.add(lblNewLabel_4, gbc_lblNewLabel_4); + lblSummary_3 = new JLabel("Tile Entities"); GridBagConstraints gbc_lblSummary_3 = new GridBagConstraints(); gbc_lblSummary_3.anchor = GridBagConstraints.LINE_START; @@ -330,6 +280,29 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ gbc_lblSummaryAmountTileEnts.gridy = 3; panelSummary.add(lblSummaryAmountTileEnts, gbc_lblSummaryAmountTileEnts); + lblSummary_15 = new JLabel("Download"); + GridBagConstraints gbc_lblSummary_15 = new GridBagConstraints(); + gbc_lblSummary_15.anchor = GridBagConstraints.WEST; + gbc_lblSummary_15.insets = new Insets(0, 0, 5, 5); + gbc_lblSummary_15.gridx = 9; + gbc_lblSummary_15.gridy = 3; + panelSummary.add(lblSummary_15, gbc_lblSummary_15); + + lblSummaryDownload = new JLabel("0"); + GridBagConstraints gbc_lblSummaryDownload = new GridBagConstraints(); + gbc_lblSummaryDownload.anchor = GridBagConstraints.EAST; + gbc_lblSummaryDownload.insets = new Insets(0, 0, 5, 5); + gbc_lblSummaryDownload.gridx = 11; + gbc_lblSummaryDownload.gridy = 3; + panelSummary.add(lblSummaryDownload, gbc_lblSummaryDownload); + + lblNewLabel_5 = new JLabel("kB/s"); + GridBagConstraints gbc_lblNewLabel_5 = new GridBagConstraints(); + gbc_lblNewLabel_5.insets = new Insets(0, 0, 5, 5); + gbc_lblNewLabel_5.gridx = 12; + gbc_lblNewLabel_5.gridy = 3; + panelSummary.add(lblNewLabel_5, gbc_lblNewLabel_5); + lblSummary_4 = new JLabel("Entities"); GridBagConstraints gbc_lblSummary_4 = new GridBagConstraints(); gbc_lblSummary_4.anchor = GridBagConstraints.WEST; @@ -444,11 +417,101 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ lblSummaryTickChart = new JLabel(""); GridBagConstraints gbc_lblSummaryTickChart = new GridBagConstraints(); gbc_lblSummaryTickChart.fill = GridBagConstraints.BOTH; - gbc_lblSummaryTickChart.gridwidth = 18; - gbc_lblSummaryTickChart.gridx = 1; + gbc_lblSummaryTickChart.gridwidth = 16; + gbc_lblSummaryTickChart.gridx = 0; gbc_lblSummaryTickChart.gridy = 12; panelSummary.add(lblSummaryTickChart, gbc_lblSummaryTickChart); + panelEntityAmount = new JPanel(); + tabbedPane.addTab("Entity Amount", null, panelEntityAmount, null); + GridBagLayout gbl_panelEntityAmount = new GridBagLayout(); + gbl_panelEntityAmount.columnWidths = new int[]{217, 407, 217, 0}; + gbl_panelEntityAmount.rowHeights = new int[]{0, 402, 30, 0}; + gbl_panelEntityAmount.columnWeights = new double[]{0.0, 0.0, 1.0, Double.MIN_VALUE}; + gbl_panelEntityAmount.rowWeights = new double[]{0.0, 1.0, 0.0, Double.MIN_VALUE}; + panelEntityAmount.setLayout(gbl_panelEntityAmount); + + chkBoxDisplayAll = new JCheckBox("Filter Entities"); + GridBagConstraints gbc_chkBoxDisplayAll = new GridBagConstraints(); + gbc_chkBoxDisplayAll.anchor = GridBagConstraints.WEST; + gbc_chkBoxDisplayAll.insets = new Insets(0, 0, 5, 5); + gbc_chkBoxDisplayAll.gridx = 0; + gbc_chkBoxDisplayAll.gridy = 0; + chkBoxDisplayAll.addItemListener(this); + panelEntityAmount.add(chkBoxDisplayAll, gbc_chkBoxDisplayAll); + + btnRefreshEntityAmount = new JButton("Refresh"); + GridBagConstraints gbc_btnRefreshEntityAmount = new GridBagConstraints(); + gbc_btnRefreshEntityAmount.anchor = GridBagConstraints.EAST; + gbc_btnRefreshEntityAmount.insets = new Insets(0, 0, 5, 0); + gbc_btnRefreshEntityAmount.gridx = 2; + gbc_btnRefreshEntityAmount.gridy = 0; + btnRefreshEntityAmount.addActionListener(this); + + btnAmountKillAll = new JButton("Kill All"); + btnAmountKillAll.addActionListener(this); + GridBagConstraints gbc_btnAmountKillAll = new GridBagConstraints(); + gbc_btnAmountKillAll.anchor = GridBagConstraints.EAST; + gbc_btnAmountKillAll.insets = new Insets(0, 0, 5, 5); + gbc_btnAmountKillAll.gridx = 1; + gbc_btnAmountKillAll.gridy = 0; + panelEntityAmount.add(btnAmountKillAll, gbc_btnAmountKillAll); + panelEntityAmount.add(btnRefreshEntityAmount, gbc_btnRefreshEntityAmount); + + scrollPaneEntityAmount = new JScrollPane(); + GridBagConstraints gbc_scrollPaneEntityAmount = new GridBagConstraints(); + gbc_scrollPaneEntityAmount.gridwidth = 3; + gbc_scrollPaneEntityAmount.fill = GridBagConstraints.BOTH; + gbc_scrollPaneEntityAmount.insets = new Insets(0, 0, 5, 0); + gbc_scrollPaneEntityAmount.gridx = 0; + gbc_scrollPaneEntityAmount.gridy = 1; + panelEntityAmount.add(scrollPaneEntityAmount, gbc_scrollPaneEntityAmount); + + tableEntityList = new JTable(); + tableEntityList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + tableEntityList.setModel(new DefaultTableModel( + new Object[][] { + {null, null}, + }, + new String[] { + "Type", "Amount" + } + ) { + Class[] columnTypes = new Class[] { + String.class, Integer.class + }; + public Class getColumnClass(int columnIndex) { + return columnTypes[columnIndex]; + } + boolean[] columnEditables = new boolean[] { + false, false + }; + public boolean isCellEditable(int row, int column) { + return columnEditables[column]; + } + }); + tableEntityList.getColumnModel().getColumn(0).setPreferredWidth(231); + tableEntityList.getColumnModel().getColumn(1).setPreferredWidth(237); + tableEntityList.setAutoCreateRowSorter(true); + scrollPaneEntityAmount.setViewportView(tableEntityList); + + labelAmountTotal = new JLabel("Total"); + labelAmountTotal.setHorizontalAlignment(SwingConstants.CENTER); + GridBagConstraints gbc_labelAmountTotal = new GridBagConstraints(); + gbc_labelAmountTotal.fill = GridBagConstraints.BOTH; + gbc_labelAmountTotal.insets = new Insets(0, 0, 0, 5); + gbc_labelAmountTotal.gridx = 0; + gbc_labelAmountTotal.gridy = 2; + panelEntityAmount.add(labelAmountTotal, gbc_labelAmountTotal); + + labelAmountValue = new JLabel("0"); + labelAmountValue.setHorizontalAlignment(SwingConstants.CENTER); + GridBagConstraints gbc_labelAmountValue = new GridBagConstraints(); + gbc_labelAmountValue.fill = GridBagConstraints.BOTH; + gbc_labelAmountValue.gridx = 2; + gbc_labelAmountValue.gridy = 2; + panelEntityAmount.add(labelAmountValue, gbc_labelAmountValue); + panelTimingTE = new JPanel(); tabbedPane.addTab("TileEntity Timing", null, panelTimingTE, null); GridBagLayout gbl_panelTimingTE = new GridBagLayout(); @@ -798,6 +861,13 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ public JLabel getLblSummaryTimingWorldTick() { return lblSummaryTimingWorldTick; } + public JLabel getLblSummaryUpload() { + return lblSummaryUpload; + } + public JLabel getLblSummaryDownload() { + return lblSummaryDownload; + } + //public JLabel getLblSummaryTimingGlobalUpdate() { // return lblSummaryTimingGlobalUpdate; //} @@ -887,4 +957,5 @@ public class SwingUI extends JFrame implements ActionListener, ItemListener{ + } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index 2a69907..fd26918 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -36,6 +36,7 @@ import mcp.mobius.opis.data.holders.basetypes.CoordinatesBlock; import mcp.mobius.opis.data.server.EntUpdateProfiler; import mcp.mobius.opis.data.server.EntityProfiler; import mcp.mobius.opis.data.server.HandlerProfiler; +import mcp.mobius.opis.data.server.PacketProfiler; import mcp.mobius.opis.data.server.WorldTickProfiler; import mcp.mobius.opis.data.server.TickProfiler; import mcp.mobius.opis.data.server.TileEntityProfiler; @@ -116,6 +117,7 @@ public class modOpis { ProfilerRegistrar.registerProfilerWorldTick(new WorldTickProfiler()); ProfilerRegistrar.registerProfilerTick(TickProfiler.instance()); ProfilerRegistrar.registerProfilerEntUpdate(new EntUpdateProfiler()); + ProfilerRegistrar.registerProfilerPacket(PacketProfiler.instance()); } } diff --git a/mcp/mobius/opis/network/OpisPacketHandler.java b/mcp/mobius/opis/network/OpisPacketHandler.java index e6efdd6..12732b5 100644 --- a/mcp/mobius/opis/network/OpisPacketHandler.java +++ b/mcp/mobius/opis/network/OpisPacketHandler.java @@ -11,6 +11,7 @@ import mcp.mobius.opis.data.client.DataCache; import mcp.mobius.opis.data.holders.basetypes.CoordinatesChunk; import mcp.mobius.opis.data.holders.basetypes.SerialDouble; import mcp.mobius.opis.data.holders.basetypes.SerialInt; +import mcp.mobius.opis.data.holders.basetypes.SerialLong; import mcp.mobius.opis.data.holders.basetypes.TicketData; import mcp.mobius.opis.data.holders.stats.StatsEntity; import mcp.mobius.opis.data.holders.stats.StatsTickHandler; @@ -172,7 +173,13 @@ public class OpisPacketHandler implements IPacketHandler { 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); + DataCache.instance().setTimingTick(castedPacket.data); + + else if ((castedPacket.maintype == DataReq.VALUE) && (castedPacket.subtype == DataReq.AMOUNT) && (castedPacket.target == DataReq.UPLOAD)) + DataCache.instance().setAmountUpload(((SerialLong)castedPacket.data).value); + + else if ((castedPacket.maintype == DataReq.VALUE) && (castedPacket.subtype == DataReq.AMOUNT) && (castedPacket.target == DataReq.DOWNLOAD)) + DataCache.instance().setAmountDownload(((SerialLong)castedPacket.data).value); } } diff --git a/mcp/mobius/opis/network/enums/DataReq.java b/mcp/mobius/opis/network/enums/DataReq.java index 8bdd7d2..3cff8b3 100644 --- a/mcp/mobius/opis/network/enums/DataReq.java +++ b/mcp/mobius/opis/network/enums/DataReq.java @@ -33,7 +33,9 @@ public enum DataReq { TICKETS("tickets"), TICK("tick"), WORLDTICK("worldtick"), - ENTUPDATE("entupdate"); + ENTUPDATE("entupdate"), + UPLOAD("outdata"), + DOWNLOAD("indata"); private String text; diff --git a/mcp/mobius/opis/server/OpisServerTickHandler.java b/mcp/mobius/opis/server/OpisServerTickHandler.java index 09096b9..2fe9416 100644 --- a/mcp/mobius/opis/server/OpisServerTickHandler.java +++ b/mcp/mobius/opis/server/OpisServerTickHandler.java @@ -13,6 +13,7 @@ import mcp.mobius.opis.modOpis; import mcp.mobius.opis.data.holders.basetypes.AmountHolder; import mcp.mobius.opis.data.holders.basetypes.SerialDouble; import mcp.mobius.opis.data.holders.basetypes.SerialInt; +import mcp.mobius.opis.data.holders.basetypes.SerialLong; import mcp.mobius.opis.data.holders.stats.StatsChunk; import mcp.mobius.opis.data.holders.stats.StatsEntity; import mcp.mobius.opis.data.holders.stats.StatsTickHandler; @@ -23,6 +24,7 @@ import mcp.mobius.opis.data.managers.GlobalTimingManager; import mcp.mobius.opis.data.managers.TickHandlerManager; import mcp.mobius.opis.data.managers.TileEntityManager; import mcp.mobius.opis.data.server.EntUpdateProfiler; +import mcp.mobius.opis.data.server.PacketProfiler; import mcp.mobius.opis.data.server.WorldTickProfiler; import mcp.mobius.opis.data.server.TickProfiler; import mcp.mobius.opis.network.enums.DataReq; @@ -43,7 +45,8 @@ public class OpisServerTickHandler implements ITickHandler { public long profilerUpdateTickCounter = 0; public long clientUpdateTickCounter = 0; public long profilerRunningTicks; - + public long timeLastUpdate = System.nanoTime(); + public static OpisServerTickHandler instance; public OpisServerTickHandler(){ @@ -57,12 +60,16 @@ public class OpisServerTickHandler implements ITickHandler { @Override public void tickEnd(EnumSet type, Object... tickData) { if(type.contains(TickType.SERVER)){ - if ((TickProfiler.instance().profiledTicks % 20) == 0){ - TickProfiler.instance().profiledTicks = 0; - - for (EntityPlayer player : PlayerTracker.instance().playersSwing){ + + if (System.nanoTime() - timeLastUpdate > 1000000000){ + timeLastUpdate = System.nanoTime(); + for (EntityPlayer player : PlayerTracker.instance().playersSwing){ + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.AMOUNT, DataReq.UPLOAD, new SerialLong(PacketProfiler.instance().dataSizeOut)), (Player)player); + PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.AMOUNT, DataReq.DOWNLOAD, new SerialLong(PacketProfiler.instance().dataSizeIn)), (Player)player); PacketDispatcher.sendPacketToPlayer(Packet_DataValue.create(DataReq.VALUE, DataReq.TIMING, DataReq.TICK, TickProfiler.instance().stats), (Player)player); } + PacketProfiler.instance().dataSizeOut = 0L; + PacketProfiler.instance().dataSizeIn = 0L; } clientUpdateTickCounter++;