Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2855 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ma ma/ui/panels plugins

Subject: perfsonar development work

List archive

perfsonar: r2855 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ma ma/ui/panels plugins


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2855 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ma ma/ui/panels plugins
  • Date: Wed, 19 Sep 2007 11:39:51 -0400
Author: nina
Date: 2007-09-19 11:39:51 -0400 (Wed, 19 Sep 2007)
New Revision: 2855

Added:

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MANonunicastPackets.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAUnicastPackets.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/PSPacketsDatum.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_Errors.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetadataChartSet.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetricsOptionPanel.java
Log:
initial support for additional event types

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MANonunicastPackets.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
2007-09-18 23:19:56 UTC (rev 2854)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
2007-09-19 15:39:51 UTC (rev 2855)
@@ -184,7 +184,11 @@
if
("http://ggf.org/ns/nmwg/characteristic/discards/2.0".equals(getCurrentEventType()))
return new MARequest_Discards();
if
("http://ggf.org/ns/nmwg/characteristic/errors/2.0".equals(getCurrentEventType()))
- return new MARequest_Errors();
+ return new MARequest_Errors();
+ if
("http://ggf.org/ns/nmwg/characteristic/packets/unicast/2.0/".equals(getCurrentEventType()))
+ return new MAUnicastPackets();
+ if
("http://ggf.org/ns/nmwg/characteristic/packets/nonunicast/2.0/".equals(getCurrentEventType()))
+ return new MANonunicastPackets();
}
return null;
}
@@ -200,6 +204,8 @@
ifDataset.addSeries("outbound",new
InterfaceUtilizationSeries("outbound",false));
ifDataset.addSeries("Eps",new PerfsonarTimeSeries("Input errors"));
ifDataset.addSeries("Dps",new PerfsonarTimeSeries("Output drops"));
+ ifDataset.addSeries("Unicast packets",new
PerfsonarTimeSeries("Unicast packets"));
+ ifDataset.addSeries("Non-unicast packets",new
PerfsonarTimeSeries("Non-unicast packets"));
return ifDataset;
}
public List<IPerfsonarSchema> getSupportedRequests() {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_Errors.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_Errors.java
2007-09-18 23:19:56 UTC (rev 2854)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_Errors.java
2007-09-19 15:39:51 UTC (rev 2855)
@@ -29,17 +29,8 @@

package org.perfsonar.perfsonarui.ma;

-import org.perfsonar.perfsonarui.AbstractUserData;
-import org.perfsonar.perfsonarui.UnsupportedTypeException;
-import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
-import org.perfsonar.perfsonarui.plugins.MetaDataList;
import org.perfsonar.perfsonarui.plugins.PSCountsDatum;
import org.perfsonar.perfsonarui.plugins.PSErrorsDatum;
-import org.perfsonar.perfsonarui.plugins.PSTime;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;

public class MARequest_Errors extends MARequestPerfsonar2_0 {
public MARequest_Errors() {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
2007-09-18 23:19:56 UTC (rev 2854)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MARequest_NMWG2.java
2007-09-19 15:39:51 UTC (rev 2855)
@@ -58,6 +58,9 @@
{"netutil","http://ggf.org/ns/nmwg/characteristic/utilization/2.0/"},
{"errors","http://ggf.org/ns/nmwg/characteristic/errors/2.0/"},
{"discards","http://ggf.org/ns/nmwg/characteristic/discards/2.0/"},
+
{"nonunicast","http://ggf.org/ns/nmwg/characteristic/packets/nonunicast/2.0/"},
+
{"unicast","http://ggf.org/ns/nmwg/characteristic/packets/unicast/2.0/"},
+ {"snmp","http://ggf.org/ns/nmwg/tools/snmp/2.0/"},
};
protected static String[] URI_nmwg_select = {
"",

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAUnicastPackets.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
2007-09-18 23:19:56 UTC (rev 2854)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
2007-09-19 15:39:51 UTC (rev 2855)
@@ -264,11 +264,14 @@
private JFreeChart createChart(MAMetadataList dataList) {
dataset = new MetadataChartSet(dataList);
dataset.addChangeListener(this);
- selectedItemPaint = new Paint[4];
+ selectedItemPaint = new Paint[6];
selectedItemPaint[0] = new Color(0,255,0,200); //in
selectedItemPaint[1] = new Color(0,0,255,200); //out
selectedItemPaint[2] = new Color(255,0,0,200); //errors
selectedItemPaint[3] = new Color(0,0,0,200); //drops
+ selectedItemPaint[4] = new Color(255,255,0,200); //non-unicast packets
+ selectedItemPaint[5] = new Color(0,255,255,200); //unicast
packets
+
LayeredBarRenderer barRenderer = new LayeredBarRenderer() {
/**
* Comment for <code>serialVersionUID</code>
@@ -358,13 +361,17 @@

barRenderer.setSeriesPaint(MetadataChartSet.SERIES_OUT,MAPerfsonarModel.outSeriesColor[0]);
barRenderer.setSeriesPaint(MetadataChartSet.SERIES_ERRORS,new
Color(200,0,0,50));
barRenderer.setSeriesPaint(MetadataChartSet.SERIES_DISCARDS,new
Color(20,20,20,50));
+
barRenderer.setSeriesPaint(MetadataChartSet.SERIES_UNICASTPACKETS,new
Color(200,200,0,50));
+
barRenderer.setSeriesPaint(MetadataChartSet.SERIES_NONUNICASTPACKETS,new
Color(20,200,200,50));


barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_CAPACITY, 1);
barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_IN,1);
- barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_OUT,0.6);
- barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_ERRORS,0.3);
- barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_DISCARDS,0.1);

+ barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_OUT,0.8);
+ barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_ERRORS,0.6);
+ barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_DISCARDS,0.4);
+
barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_UNICASTPACKETS,0.2);

+
barRenderer.setSeriesBarWidth(MetadataChartSet.SERIES_NONUNICASTPACKETS,0.1);



//barRenderer.setBaseItemLabelGenerator(
@@ -403,6 +410,8 @@
barRenderer.setSeriesItemLabelsVisible(MetadataChartSet.SERIES_OUT,
Boolean.TRUE);

barRenderer.setSeriesItemLabelsVisible(MetadataChartSet.SERIES_ERRORS,
Boolean.TRUE);

barRenderer.setSeriesItemLabelsVisible(MetadataChartSet.SERIES_DISCARDS,
Boolean.TRUE);
+
barRenderer.setSeriesItemLabelsVisible(MetadataChartSet.SERIES_NONUNICASTPACKETS,
Boolean.TRUE);
+
barRenderer.setSeriesItemLabelsVisible(MetadataChartSet.SERIES_UNICASTPACKETS,
Boolean.TRUE);
barRenderer.setItemLabelPaint(Color.BLACK);



Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetadataChartSet.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetadataChartSet.java
2007-09-18 23:19:56 UTC (rev 2854)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetadataChartSet.java
2007-09-19 15:39:51 UTC (rev 2855)
@@ -54,6 +54,8 @@
public static final int SERIES_OUT = 2;
public static final int SERIES_ERRORS = 3;
public static final int SERIES_DISCARDS = 4;
+ public static final int SERIES_NONUNICASTPACKETS = 5;
+ public static final int SERIES_UNICASTPACKETS = 6;

protected int pageSize = 30;
protected int page = 0;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetricsOptionPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetricsOptionPanel.java
2007-09-18 23:19:56 UTC (rev 2854)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetricsOptionPanel.java
2007-09-19 15:39:51 UTC (rev 2855)
@@ -29,7 +29,6 @@

package org.perfsonar.perfsonarui.ma.ui.panels;

-import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

@@ -50,7 +49,9 @@
protected String[][] metrics = {

{"Utilization","http://ggf.org/ns/nmwg/characteristic/utilization/2.0"},
{"Input
errors","http://ggf.org/ns/nmwg/characteristic/errors/2.0"},
- {"Output
drops","http://ggf.org/ns/nmwg/characteristic/discards/2.0"}
+ {"Output
drops","http://ggf.org/ns/nmwg/characteristic/discards/2.0"},
+ {"Non-unicast
packets","http://ggf.org/ns/nmwg/characteristic/packets/nonunicast/2.0/"},
+ {"Unicast
packets","http://ggf.org/ns/nmwg/characteristic/packets/unicast/2.0/"}
};

public MetricsOptionPanel(MAPerfsonarModel model) {

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/PSPacketsDatum.java


  • perfsonar: r2855 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: ma ma/ui/panels plugins, svnlog, 09/19/2007

Archive powered by MHonArc 2.6.16.

Top of Page