Mercurial > hg > blitz_condensed
changeset 23:28c84687bdb8
Add an additional option on Dashboard to display full stats as raw strings.
| author | Dan Creswell <dan.creswell@gmail.com> |
|---|---|
| date | Fri, 28 Aug 2009 21:01:04 +0100 |
| parents | b7e52953b7a6 |
| children | c3e40ba8250a |
| files | src/org/dancres/blitz/tools/dash/DashBoard.java src/org/dancres/blitz/tools/dash/DashBoardFrame.java src/org/dancres/blitz/tools/dash/StartDashBoard.java src/org/dancres/blitz/tools/dash/StatsFrame.java src/org/dancres/blitz/tools/dash/images/steak.gif |
| diffstat | 5 files changed, 35 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/org/dancres/blitz/tools/dash/DashBoard.java Fri Aug 28 17:23:33 2009 +0100 +++ b/src/org/dancres/blitz/tools/dash/DashBoard.java Fri Aug 28 21:01:04 2009 +0100 @@ -49,6 +49,7 @@ spaceOpButton = new javax.swing.JButton(); instancesButton = new javax.swing.JButton(); memoryButton = new javax.swing.JButton(); + rawButton = new javax.swing.JButton(); takeCount = new javax.swing.JLabel(); writeCount = new javax.swing.JLabel(); readCount = new javax.swing.JLabel(); @@ -148,6 +149,17 @@ add(memoryButton); memoryButton.setBounds(580, 10, 140, 26); + rawButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("images/steak.gif"))); + rawButton.setText("Raw"); + rawButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + rawButtonActionPerformed(evt); + } + }); + + add(rawButton); + rawButton.setBounds(720, 10, 140, 26); + takeCount.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); takeCount.setText("0"); add(takeCount); @@ -189,6 +201,13 @@ statsFrame.setVisible(true); }//GEN-LAST:event_memoryButtonActionPerformed + private void rawButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_memoryButtonActionPerformed + StatsFrame statsFrame=new StatsFrame(parent,"Raw",StatsFrame.RAW); + _openWindows.add(statsFrame); + statsFrame.setBounds(getNextWinBounds()); + statsFrame.setVisible(true); + } + private void memoryButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_memoryButtonActionPerformed // Add your handling code here: //JOptionPane.showMessageDialog(this,"Not implemented yet!"); @@ -232,6 +251,7 @@ private javax.swing.JButton blockingOpButton; private javax.swing.JLabel instanceCount; private javax.swing.JButton instancesButton; + private javax.swing.JButton rawButton; private javax.swing.JProgressBar memoryBar; private javax.swing.JButton memoryButton; private javax.swing.JLabel memoryCount;
--- a/src/org/dancres/blitz/tools/dash/DashBoardFrame.java Fri Aug 28 17:23:33 2009 +0100 +++ b/src/org/dancres/blitz/tools/dash/DashBoardFrame.java Fri Aug 28 21:01:04 2009 +0100 @@ -56,7 +56,7 @@ } } - setSize(740,140); + setSize(880,140); //add listener to intterupt thread on close addWindowListener( new WindowAdapter(){
--- a/src/org/dancres/blitz/tools/dash/StartDashBoard.java Fri Aug 28 17:23:33 2009 +0100 +++ b/src/org/dancres/blitz/tools/dash/StartDashBoard.java Fri Aug 28 21:01:04 2009 +0100 @@ -21,7 +21,7 @@ private static final long MAX_DISCOVER_TIME = 15 * 1000; //changed to public as this is accessed by the ServiceUI - public static final String VER="Blitz dashboard: v1.2"; + public static final String VER="Blitz dashboard: v1.3"; public static void main(String [] args){ try{
--- a/src/org/dancres/blitz/tools/dash/StatsFrame.java Fri Aug 28 17:23:33 2009 +0100 +++ b/src/org/dancres/blitz/tools/dash/StatsFrame.java Fri Aug 28 21:01:04 2009 +0100 @@ -24,6 +24,7 @@ import javax.swing.JScrollPane; import javax.swing.JTabbedPane; import javax.swing.JTable; +import javax.swing.JTextArea; import javax.swing.JTree; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; @@ -52,12 +53,14 @@ //add for Outrigger views private Object _adminProxy; private JFrame _frame; + private JTextArea _textArea = new JTextArea(); public static final int OPSTATS = 0; public static final int INSTANCES = 1; public static final int MEMORY = 2; public static final int TXNS = 3; public static final int BLOCKERS = 4; + public static final int RAW = 5; public StatsFrame(JFrame parent,String title, int mode,Object adminProxy) { super(parent,title,false); @@ -124,6 +127,10 @@ } else if (_mode == MEMORY || _mode == TXNS || _mode == BLOCKERS) { tp.add("History", _chart); + } else if (_mode == RAW) { + _textArea.setLineWrap(true); + _textArea.setWrapStyleWord(true); + tp.add("Raw", new JScrollPane(_textArea)); } return tp; } @@ -150,7 +157,11 @@ long txnCounter = 0; long blockingReads = 0; long blockingTakes = 0; + + StringBuffer myRaw = new StringBuffer(); + for (int i = 0; i < stats.length; i++) { + myRaw.append(stats[i].toString() +"\n"); if (stats[i] instanceof MemoryStat) { MemoryStat ms = (MemoryStat) stats[i]; double max = ms.getMaxMemory(); @@ -233,6 +244,8 @@ _chart.update(new String[]{"read", "take"}, new long[]{blockingReads, blockingTakes}); } + _textArea.setText(myRaw.toString()); + _textArea.revalidate(); } catch (Exception ex) { closeWin(); DashBoardFrame.theLogger.log(Level.SEVERE, "Problem in update", ex);