Author: jsong
Date: Thu Feb 10 19:54:22 2005
New Revision: 153338
URL: http://svn.apache.org/viewcvs?view=rev&rev=153338
Log:
Contributed by Jamie Zyskowski: updates to reportWeb - new cewolf/jfreechart
versions, added first seried plots to reports
Added:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SeriesForm.java
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SnapshotForm.java
Removed:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/ControlsForm.java
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/XmlbeansForm.java
Modified:
incubator/beehive/trunk/controls/test/perf/build.xml
incubator/beehive/trunk/controls/test/perf/webapps/build.xml
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/ReportForm.java
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SeriesProducer.java
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SnapshotProducer.java
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/postprocessors/VerticalXLabel.java
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/web.xml
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/controls.jsp
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/series.jsp
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/snapshot.jsp
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
Modified: incubator/beehive/trunk/controls/test/perf/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/build.xml?view=diff&r1=153337&r2=153338
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/build.xml Thu Feb 10 19:54:22
2005
@@ -20,7 +20,7 @@
<property environment="os"/>
<!-- standard beehive jars come from these prop files -->
- <import file="../../../beehive-imports.xml"/>
+ <import file="../../../beehive-imports.xml"/>
<property file="${beehive.home}/controls/test/common/path.properties"/>
<!-- root dirs for finding everything -->
@@ -39,7 +39,8 @@
<!-- graphing utils used in reportWeb -->
<property name="control.perf.external"
value="${control.perf.root}/external"/>
- <property name="cewolf.lib"
value="${control.perf.external}/cewolf-0.9.8/lib"/>
+ <property name="cewolf.version" value="cewolf_0_10_1"/>
+ <property name="cewolf.lib"
value="${control.perf.external}/${cewolf.version}/lib"/>
<!-- test run configuration (for web-based scenarios) -->
<property name="test.hostname" value="localhost"/>
@@ -98,16 +99,15 @@
<!-- build targets -->
<target name="bootstrap">
<mkdir dir="${control.perf.external}"/>
- <get
src="http://umn.dl.sourceforge.net/sourceforge/cewolf/cewolf-0.9.8.zip";
-
dest="${control.perf.external}/cewolf-0.9.8.zip"
+ <get
src="http://umn.dl.sourceforge.net/sourceforge/cewolf/${cewolf.version}.zip";
+
dest="${control.perf.external}/${cewolf.version}.zip"
verbose="true"/>
- <unzip src="${control.perf.external}/cewolf-0.9.8.zip"
dest="${control.perf.external}"/>
- <!-- delete so crimson.jar doesn't get copied into the report
webapp - it causes parsing errors -->
- <delete
file="${control.perf.external}/cewolf-0.9.8/lib/crimson.jar"/>
+ <mkdir dir="${control.perf.external}/${cewolf.version}"/>
+ <unzip src="${control.perf.external}/${cewolf.version}.zip"
dest="${control.perf.external}/${cewolf.version}"/>
</target>
<target name="clean.bootstrap">
- <delete dir="${control.perf.external}/cewolf-0.9.8"/>
+ <delete dir="${control.perf.external}/${cewolf.version}"/>
</target>
<target name="build.controls">
Modified: incubator/beehive/trunk/controls/test/perf/webapps/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/build.xml?view=diff&r1=153337&r2=153338
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/build.xml Thu Feb 10
19:54:22 2005
@@ -25,6 +25,7 @@
<property name="test.hostname" value="localhost"/>
<property name="test.port" value="8080"/>
<property name="webapp.waitfor.url"
value="http://${test.hostname}:${test.port}/${webapp.name}"/>
+ <property name="cewolf.root"
value="${controls.perf.root}/external/cewolf_0_10_1"/>
<target name="usage">
<echo message="" />
@@ -96,15 +97,19 @@
<property name="webapp.dir"
location="${webapp.stage.dir}/${webapp.name}"/>
<property name="do.inject.milton" value="true"/>
</ant>
- <ant antfile="${controls.test.root}/webapps/build.xml"
target="-inject.milton" inheritAll="false">
- <property name="webapp.dir"
location="${webapp.stage.dir}/${webapp.name}"/>
- <property name="do.inject.milton" value="true"/>
- </ant>
+ <ant antfile="${controls.test.root}/webapps/build.xml"
target="-inject.milton" inheritAll="false">
+ <property name="webapp.dir"
location="${webapp.stage.dir}/${webapp.name}"/>
+ <property name="do.inject.milton" value="true"/>
+ </ant>
<copy todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib">
- <fileset
dir="${controls.perf.root}/external/cewolf-0.9.8/lib">
- <exclude
name="servlet.jar"/>
+ <fileset dir="${cewolf.root}/lib">
+ <exclude name="servlet.jar"/>
+ <exclude name="crimson.jar"/>
+ <exclude name="cewolf.jar"/>
</fileset>
</copy>
+ <!-- HACK: cewolf_0_10_1 has a bug in the distro where the
cewolf.jar in lib is old! -->
+ <copy file="${cewolf.root}/build/cewolf.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
<copy file="${controls.perf.root}/external/perf-results.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
<copy
file="${controls.perf.root}/ctlbuild/lib/customcontrols.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/ReportForm.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/ReportForm.java?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/ReportForm.java
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/ReportForm.java
Thu Feb 10 19:54:22 2005
@@ -3,12 +3,5 @@
public class ReportForm
{
public String filename;
- public String regex;
- public String xaxis;
- public String xlabel;
- public String yaxis;
- public String ylabel;
- public String type;
- public String width;
- public String height;
+
}
Added:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SeriesForm.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SeriesForm.java?view=auto&rev=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SeriesForm.java
(added)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SeriesForm.java
Thu Feb 10 19:54:22 2005
@@ -0,0 +1,15 @@
+package forms;
+
+public class SeriesForm
+{
+ public String filename;
+ public String regex;
+ public String seriesname;
+ public String xaxis;
+ public String xlabel;
+ public String yaxis;
+ public String ylabel;
+ public String type;
+ public String width;
+ public String height;
+}
Added:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SnapshotForm.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SnapshotForm.java?view=auto&rev=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SnapshotForm.java
(added)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/forms/SnapshotForm.java
Thu Feb 10 19:54:22 2005
@@ -0,0 +1,14 @@
+package forms;
+
+public class SnapshotForm
+{
+ public String filename;
+ public String regex;
+ public String xaxis;
+ public String xlabel;
+ public String yaxis;
+ public String ylabel;
+ public String type;
+ public String width;
+ public String height;
+}
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SeriesProducer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SeriesProducer.java?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SeriesProducer.java
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SeriesProducer.java
Thu Feb 10 19:54:22 2005
@@ -1,54 +1,48 @@
package graphing;
-import java.text.SimpleDateFormat;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.Iterator;
-import java.io.Serializable;
-import org.jfree.data.CategoryDataset;
-import org.jfree.data.Dataset;
-import org.jfree.data.DefaultCategoryDataset;
-import org.jfree.data.XYSeriesCollection;
-import org.jfree.data.XYSeries;
-import de.laures.cewolf.DatasetProduceException;
-import de.laures.cewolf.DatasetProducer;
-import de.laures.cewolf.CategoryItemLinkGenerator;
-import java.io.File;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import org.apache.xmlbeans.XmlException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jfree.chart.entity.CategoryItemEntity;
-import org.jfree.chart.tooltips.CategoryToolTipGenerator;
-//Controls
-import org.apache.beehive.controls.api.bean.Control;
-import org.apache.beehive.controls.perf.controls.custom.PerfResultControlBean;
-import org.apache.beehive.controls.perf.controls.custom.StrlenControlBean;
-
-//xmlbeans
-import org.openuri.perf.*;
+import org.apache.xmlbeans.XmlException;
+import org.jfree.data.general.Dataset;
+import org.jfree.data.xy.XYSeries;
+import org.jfree.data.xy.XYSeriesCollection;
+import org.openuri.perf.Custom;
import org.openuri.perf.Result;
+import org.openuri.perf.ResultSetDocument;
+
+import de.laures.cewolf.DatasetProduceException;
+import de.laures.cewolf.DatasetProducer;
public class SeriesProducer implements DatasetProducer, Serializable {
+ static final long serialVersionUID = -1;
+ static final String LOGDELIM = "SERIES_PRODUCER: ";
+
public Object produceDataset(Map params) throws DatasetProduceException
{
// keys used to retreive params passed from the jsp form
- String k_regex = "regex";
String k_filename = "filename";
String k_xaxis = "xaxis";
String k_yaxis = "yaxis";
- // retreive the param values
- String regex = (String)params.get((Object)k_regex);
- String filename = (String)params.get((Object)k_filename);
- String xaxis = (String)params.get((Object)k_xaxis);
- String yaxis = (String)params.get((Object)k_yaxis);
+ String k_regexMap = "regexmap";
+ // retreive the param values
+ String filename = (String)params.get(k_filename);
+ String xaxis = (String)params.get(k_xaxis);
+ String yaxis = (String)params.get(k_yaxis);
+ HashMap<String,String> regexBySeriesName =
(HashMap<String,String>)params.get(k_regexMap);
+
+ // get the series params
+ System.out.println(LOGDELIM+"filename="+filename);
+ System.out.println(LOGDELIM+"xaxis="+xaxis);
+ System.out.println(LOGDELIM+"yaxis="+yaxis);
+
System.out.println(LOGDELIM+"regexBySeriesName="+regexBySeriesName);
// get the result set specified by filename
ResultSetDocument.ResultSet resultset = null;
@@ -57,23 +51,35 @@
resultset = doc.getResultSet();
}
catch(XmlException xe){
- System.out.println("got xml exception:
"+xe.getMessage());
+ System.out.println(LOGDELIM+"got xml exception:
"+xe.getMessage());
xe.printStackTrace();
}
catch(IOException ioe){
- System.out.println("got ioe: "+ioe.getMessage());
+ System.out.println(LOGDELIM+"got ioe:
"+ioe.getMessage());
ioe.printStackTrace();
}
if(null != resultset)
- System.out.println("got results
"+resultset.getEnvironment().getDate().toString());
+ System.out.println(LOGDELIM+"got results
"+resultset.getEnvironment().getDate().toString());
else
- System.out.println("resutls are null :-(");
+ System.out.println(LOGDELIM+"resutls are null :-(");
+
+ // initialize each series in the hashmap
+ XYSeriesCollection dataset = new XYSeriesCollection();
+ Set<String> keys = regexBySeriesName.keySet();
+ Iterator it = keys.iterator();
+ while(it.hasNext())
+ {
+ String name = (String)it.next();
+ String regex = regexBySeriesName.get(name);
+ System.out.println(LOGDELIM+"name="+name);
+ System.out.println(LOGDELIM+"regex="+regex);
+ HashMap<Long,String> seriesResultIds =
getFullnamesById(regex,resultset);
+ dataset.addSeries(getXYSeriesDataset(name,
seriesResultIds,xaxis,yaxis,resultset));
+ }
- // map matching test names to result ids
- HashMap<Long,String> names = getNames(regex,resultset);
- return getXYSeriesDataset(regex,names,xaxis,yaxis,resultset);
+ return (Dataset)dataset;
}
public boolean hasExpired(Map params, Date since) {
@@ -81,68 +87,66 @@
}
public String getProducerId() {
- return "SnapshotProducer";
+ return "SeriesProducer";
}
////////////
// utilities
////////////
- private Dataset getXYSeriesDataset(String p_seriesName,
HashMap<Long,String> p_names, String p_xvalue, String p_yvalue,
ResultSetDocument.ResultSet p_resultset)
+ private XYSeries getXYSeriesDataset(String p_seriesName,
HashMap<Long,String> p_resultIds, String p_xvalue, String p_yvalue,
ResultSetDocument.ResultSet p_resultset)
{
- System.out.println("getXYSeriesDataset START");
XYSeries xyseries = new XYSeries(p_seriesName);
- Dataset dataset = new XYSeriesCollection(xyseries);
Result[] results = p_resultset.getResultArray();
for(int i=0; i<results.length; i++)
{
- if(p_names.containsKey(results[i].getId()))
+ if(p_resultIds.containsKey(results[i].getId()))
{
- String name = p_names.get(results[i].getId());
+ String name =
p_resultIds.get(results[i].getId());
if(p_yvalue.equalsIgnoreCase("time") &&
results[i].isSetTime())
{
- System.out.println("adding y-axis time
data for: "+name);
+ System.out.println(LOGDELIM+"adding
y-axis time data for: "+name);
Float xvalue =
Float.parseFloat(getCustomValue(p_xvalue,results[i]));
xyseries.add((Number) xvalue,(Number)
results[i].getTime());
}
else if(p_yvalue.equalsIgnoreCase("memory") &&
results[i].isSetMemory())
{
- System.out.println("adding y-axis
memory data for: "+name);
+ System.out.println(LOGDELIM+"adding
y-axis memory data for: "+name);
Float xvalue =
Float.parseFloat(getCustomValue(p_xvalue,results[i]));
xyseries.add((Number) xvalue,(Number)
results[i].getMemory());
}
else if(p_xvalue.equalsIgnoreCase("time") &&
results[i].isSetTime())
{
- System.out.println("adding x-axis time
data for: "+name);
+ System.out.println(LOGDELIM+"adding
x-axis time data for: "+name);
Float yvalue =
Float.parseFloat(getCustomValue(p_yvalue,results[i]));
- System.out.println("adding y-axis
custom data ("+yvalue+") for:"+name);
+ System.out.println(LOGDELIM+"adding
y-axis custom data ("+yvalue+") for:"+name);
xyseries.add((Number)results[i].getTime(),(Number)yvalue);
}
else if(p_xvalue.equalsIgnoreCase("memory") &&
results[i].isSetMemory())
{
- System.out.println("adding x-axis
memory data for: "+name);
+ System.out.println(LOGDELIM+"adding
x-axis memory data for: "+name);
Float yvalue =
Float.parseFloat(getCustomValue(p_yvalue,results[i]));
- System.out.println("adding y-axis
custom data ("+yvalue+") for:"+name);
+ System.out.println(LOGDELIM+"adding
y-axis custom data ("+yvalue+") for:"+name);
xyseries.add((Number)results[i].getMemory(),(Number)yvalue);
}
else if(null !=
getCustomValue(p_yvalue,results[i]) &&
null !=
getCustomValue(p_xvalue,results[i]))
{
- System.out.println("adding custom
y-axis data ("+p_yvalue+") for: "+name);
- System.out.println("adding custom
x-axis data ("+p_xvalue+") for: "+name);
+ System.out.println(LOGDELIM+"adding
custom y-axis data ("+p_yvalue+") for: "+name);
+ System.out.println(LOGDELIM+"adding
custom x-axis data ("+p_xvalue+") for: "+name);
Float yvalue =
Float.parseFloat(getCustomValue(p_yvalue,results[i]));
Float xvalue =
Float.parseFloat(getCustomValue(p_xvalue,results[i]));
xyseries.add((Number)xvalue,(Number)yvalue);
}
else
{
- System.out.println("ERROR finding data
for test: "+name);
+ System.out.println(LOGDELIM+"ERROR
finding data for test: "+name);
}
}
- }
- return dataset;
+ }
+ return xyseries;
}
- private HashMap<Long,String> getNames(String p_regex,
ResultSetDocument.ResultSet p_resultset)
+ private HashMap<Long,String> getFullnamesById(String p_regex,
ResultSetDocument.ResultSet p_resultset)
{
Result[] results = p_resultset.getResultArray();
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SnapshotProducer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SnapshotProducer.java?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SnapshotProducer.java
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/SnapshotProducer.java
Thu Feb 10 19:54:22 2005
@@ -1,45 +1,25 @@
package graphing;
-//import java.text.SimpleDateFormat;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
-//import java.util.HashSet;
import java.util.Map;
-//import java.util.Set;
-//import java.util.Iterator;
-import java.io.Serializable;
-//import org.jfree.chart.JFreeChart;
-//import org.jfree.chart.plot.CategoryPlot;
-//import org.jfree.chart.axis.HorizontalCategoryAxis;
-//import org.jfree.data.CategoryDataset;
-import org.jfree.data.Dataset;
-import org.jfree.data.DefaultCategoryDataset;
-//import org.jfree.data.XYSeriesCollection;
-//import org.jfree.data.XYSeries;
-import de.laures.cewolf.DatasetProduceException;
-import de.laures.cewolf.DatasetProducer;
-//import de.laures.cewolf.CategoryItemLinkGenerator;
-//import de.laures.cewolf.ChartPostProcessor;
-import java.io.File;
-import java.io.IOException;
-//import java.io.FileNotFoundException;
-import org.apache.xmlbeans.XmlException;
-
-//import org.apache.commons.logging.Log;
-//import org.apache.commons.logging.LogFactory;
-//import org.jfree.chart.entity.CategoryItemEntity;
-//import org.jfree.chart.tooltips.CategoryToolTipGenerator;
-//Controls
-//import org.apache.beehive.controls.api.bean.Control;
-//import
org.apache.beehive.controls.perf.controls.custom.PerfResultControlBean;
-//import org.apache.beehive.controls.perf.controls.custom.StrlenControlBean;
-
-//xmlbeans
-import org.openuri.perf.*;
+import org.apache.xmlbeans.XmlException;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.data.general.Dataset;
+import org.openuri.perf.Custom;
import org.openuri.perf.Result;
+import org.openuri.perf.ResultSetDocument;
+
+import de.laures.cewolf.DatasetProduceException;
+import de.laures.cewolf.DatasetProducer;
public class SnapshotProducer implements DatasetProducer, Serializable {
+ static final long serialVersionUID = -1;
+ static final String LOGDELIM = "SNAPSHOT_PRODUCER: ";
public Object produceDataset(Map params) throws DatasetProduceException
{
@@ -65,18 +45,18 @@
resultset = doc.getResultSet();
}
catch(XmlException xe){
- System.out.println("got xml exception:
"+xe.getMessage());
+ System.out.println(LOGDELIM+"got xml exception:
"+xe.getMessage());
xe.printStackTrace();
}
catch(IOException ioe){
- System.out.println("got ioe: "+ioe.getMessage());
+ System.out.println(LOGDELIM+"got ioe:
"+ioe.getMessage());
ioe.printStackTrace();
}
if(null != resultset)
- System.out.println("got results
"+resultset.getEnvironment().getDate().toString());
+ System.out.println(LOGDELIM+"got results
"+resultset.getEnvironment().getDate().toString());
else
- System.out.println("resutls are null :-(");
+ System.out.println(LOGDELIM+"resutls are null :-(");
// map matching test names to result ids
@@ -97,7 +77,6 @@
////////////
private Dataset getDefaultDataset(HashMap<Long,String> p_names, String
p_xvalue, String p_yvalue, ResultSetDocument.ResultSet p_resultset)
{
- System.out.println("getDefaultDataset START");
DefaultCategoryDataset dataset = new DefaultCategoryDataset();
Result[] results = p_resultset.getResultArray();
for(int i=0; i<results.length; i++)
@@ -107,7 +86,7 @@
String name = p_names.get(results[i].getId());
if(p_yvalue.equalsIgnoreCase("time") &&
results[i].isSetTime())
{
- System.out.println("adding y-axis time
data for: "+name);
+ System.out.println(LOGDELIM+"adding
y-axis time data for: "+name);
if(p_xvalue.equalsIgnoreCase("name") ||
null ==
getCustomValue(p_xvalue,results[i]))
dataset.addValue( (Number)
results[i].getTime(), name, name);
@@ -119,7 +98,7 @@
}
else if(p_yvalue.equalsIgnoreCase("memory") &&
results[i].isSetMemory())
{
- System.out.println("adding y-axis
memory data for: "+name);
+ System.out.println(LOGDELIM+"adding
y-axis memory data for: "+name);
if(null ==
getCustomValue(p_xvalue,results[i]))
dataset.addValue( (Number)
results[i].getMemory(), name, name);
else
@@ -132,23 +111,23 @@
results[i].isSetMemory() &&
null !=
getCustomValue(p_yvalue,results[i]))
{
- System.out.println("adding x-axis
memory data for: "+p_names.get(results[i].getId()));
+ System.out.println(LOGDELIM+"adding
x-axis memory data for: "+p_names.get(results[i].getId()));
Float yvalue =
Float.parseFloat(getCustomValue(p_yvalue,results[i]));
- System.out.println("adding y-axis
custom data ("+yvalue+") for:"+name);
+ System.out.println(LOGDELIM+"adding
y-axis custom data ("+yvalue+") for:"+name);
dataset.addValue( (Number)yvalue, name,
results[i].getMemory());
}
else if(null !=
getCustomValue(p_yvalue,results[i]) &&
null !=
getCustomValue(p_xvalue,results[i]))
{
- System.out.println("adding custom
y-axis data ("+p_yvalue+") for: "+name);
- System.out.println("adding custom
x-axis data ("+p_xvalue+") for: "+name);
+ System.out.println(LOGDELIM+"adding
custom y-axis data ("+p_yvalue+") for: "+name);
+ System.out.println(LOGDELIM+"adding
custom x-axis data ("+p_xvalue+") for: "+name);
Float yvalue =
Float.parseFloat(getCustomValue(p_yvalue,results[i]));
Float xvalue =
Float.parseFloat(getCustomValue(p_xvalue,results[i]));
dataset.addValue( (Number)yvalue, name,
xvalue);
}
else
{
- System.out.println("ERROR finding data
for test: "+name);
+ System.out.println(LOGDELIM+"ERROR
finding data for test: "+name);
}
}
}
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/postprocessors/VerticalXLabel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/postprocessors/VerticalXLabel.java?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/postprocessors/VerticalXLabel.java
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/src/graphing/postprocessors/VerticalXLabel.java
Thu Feb 10 19:54:22 2005
@@ -4,24 +4,22 @@
import de.laures.cewolf.ChartPostProcessor;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.CategoryPlot;
-//import org.jfree.chart.axis.CategoryAxis;
-//import org.jfree.chart.axis.Axis;
-import org.jfree.chart.axis.HorizontalCategoryAxis;
+import org.jfree.chart.axis.CategoryAxis;
+import org.jfree.chart.axis.*;
+//import org.jfree.ui.RectangleAnchor;
+//import org.jfree.text.TextBlockAnchor;
+//import org.jfree.ui.TextAnchor;
+//import org.jfree.chart.axis.CategoryLabelWidthType;
public class VerticalXLabel implements ChartPostProcessor
{
public void processChart(Object chart, Map params)
- {
- // TODO: figure out how to make the angle better
- // for reading the labels - v0.9.8 of JFreeChart
- // doens't seem to support this, and that's the version
- // that comes with cewolf v0.9.8.
-
+ {
// set the xaxis labels vertical
CategoryPlot plot = ((JFreeChart)chart).getCategoryPlot();
- HorizontalCategoryAxis axis =
(HorizontalCategoryAxis)plot.getDomainAxis();
- axis.setVerticalCategoryLabels(true);
-
+ CategoryAxis axis = plot.getDomainAxis();
+ axis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_45);
+ //System.out.println("JUST SET LABEL POSITIONS");
}
}
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/web.xml?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/web.xml
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/WEB-INF/web.xml
Thu Feb 10 19:54:22 2005
@@ -21,10 +21,26 @@
<servlet>
<servlet-name>CewolfServlet</servlet-name>
<servlet-class>de.laures.cewolf.CewolfRenderer</servlet-class>
+ <!-- sets storage implementation -->
+ <init-param>
+ <param-name>storage</param-name>
+
<param-value>de.laures.cewolf.storage.TransientSessionStorage</param-value>
+ </init-param>
+ <!-- sets overlib.js location relative to webapp -->
+ <init-param>
+ <param-name>overliburl</param-name>
+ <param-value>etc/overlib.js</param-value>
+ </init-param>
+ <!-- turn on or off debugging logging -->
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>CewolfServlet</servlet-name>
- <url-pattern>/jpf/cewolf/*</url-pattern>
+ <url-pattern>/cewolf/*</url-pattern>
</servlet-mapping>
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
Thu Feb 10 19:54:22 2005
@@ -92,11 +92,11 @@
}
@Jpf.Action()
- protected Forward snapshot(ReportForm form)
+ protected Forward snapshot(SnapshotForm form)
{
// defaults
getRequest().setAttribute("chartid","CHARTID");
- getRequest().setAttribute("title","Runtime Performance");
+ getRequest().setAttribute("title","Runtime Performance
Snapshot");
// from form
getRequest().setAttribute("filename",form.filename);
@@ -112,15 +112,21 @@
}
@Jpf.Action()
- protected Forward series(ReportForm form)
+ protected Forward series(SeriesForm form)
{
// defaults
getRequest().setAttribute("chartid","CHARTID");
- getRequest().setAttribute("title","Runtime Performance");
+ getRequest().setAttribute("title","Runtime Performance Series");
+
+ System.out.println("form.regex: "+form.regex);
+ System.out.println("form.seriesname: "+form.seriesname);
+
+ HashMap<String,String> regexmap = new HashMap<String,String>();
+ regexmap.put(form.seriesname,form.regex);
// from form
getRequest().setAttribute("filename",form.filename);
- getRequest().setAttribute("regex",form.regex);
+ getRequest().setAttribute("regexmap",regexmap);
getRequest().setAttribute("type",form.type);
getRequest().setAttribute("xaxis",form.xaxis);
getRequest().setAttribute("xlabel",form.xlabel);
@@ -132,7 +138,7 @@
}
@Jpf.Action()
- protected Forward xmlbeans(XmlbeansForm form)
+ protected Forward xmlbeans(ReportForm form)
{
initializeProperties();
System.out.println("REPORTWEB: filename="+form.filename);
@@ -168,24 +174,13 @@
getRequest().setAttribute("date",resultSet.getEnvironment().getDate().toString());
getRequest().setAttribute("jvm",resultSet.getEnvironment().getJvm());
getRequest().setAttribute("os",resultSet.getEnvironment().getOs());
+ // TODO: add appserver from result set if/once available
getRequest().setAttribute("filename",filename);
- // set various regexes so the jsp can pass them to the data
producer(s)
- // TODO: figure out why these strings can't just be in the jsp
- // TODO: didn't work as of 12/14/2004
- getRequest().setAttribute("CursorWalk",".*CursorWalk.*");
- getRequest().setAttribute("CursorGetSetGet",".*CursorGet.*");
- getRequest().setAttribute("BisLoad",".*.BisLoad.*");
- getRequest().setAttribute("DomWalk",".*DomWalk.*");
- getRequest().setAttribute("POValidate",".*POValidate.*");
- getRequest().setAttribute("POTopDown",".*POTopDown[^Save].*");
- getRequest().setAttribute("POTopDownSave",".*POTopDownSave.*");
- getRequest().setAttribute("PrimTopDown",".*[^N]PrimTopDown.*");
- getRequest().setAttribute("NPrimTopDown",".*NPrimTopDown.*");
return new Forward("xmlbeans");
}
@Jpf.Action()
- protected Forward controls(ControlsForm form)
+ protected Forward controls(ReportForm form)
{
initializeProperties();
System.out.println("REPORTWEB: filename="+form.filename);
@@ -223,17 +218,14 @@
getRequest().setAttribute("jvm",resultSet.getEnvironment().getJvm());
getRequest().setAttribute("os",resultSet.getEnvironment().getOs());
getRequest().setAttribute("filename",filename);
- // set various regexes so the jsp can pass them to the data
producer(s)
- // TODO: figure out why these strings can't just be in the jsp
- // TODO: didn't work as of 12/14/2004
- getRequest().setAttribute("StrlenPgm",".*Strlen.*");
- getRequest().setAttribute("VarargsPgm",".*VarargsPgm.*");
- getRequest().setAttribute("VarretPgm",".*VarretPgm.*");
+ //TODO: add appserver from result set if/once available
return new Forward("controls");
}
+ ////////////////////
// private utilities
+ ////////////////////
private void initializeControl(String p_dir,String p_key) throws
XmlException,IOException,ClassNotFoundException
{
PerfResultControlBean control = (PerfResultControlBean)
java.beans.Beans.instantiate(this.getClass().getClassLoader(),
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/controls.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/controls.jsp?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/controls.jsp
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/controls.jsp
Thu Feb 10 19:54:22 2005
@@ -4,6 +4,14 @@
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0";
prefix="netui-template"%>
<[EMAIL PROTECTED] uri='http://cewolf.sourceforge.net/taglib/cewolf.tld'
prefix='cewolf' %>
+<!-- global strings -->
+<%
+String g_sMemory = "memory";
+String g_sSize = "size";
+String g_sFlavor = "flavor";
+String g_sTime = "time";
+%>
+
<netui:html>
<head>
<title>report web</title>
@@ -19,8 +27,10 @@
<p>OS: <netui:label value="${requestScope.os}"/>
<p>Filename: <netui:label value="${requestScope.filename}"/>
+ <!-- chart postprocessor(s) -->
<jsp:useBean id="verticalxlabel"
class="graphing.postprocessors.VerticalXLabel"/>
+ <% String StrlenPgm = ".*Strlen.*"; %>
<jsp:useBean id="strlenpgm_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="StrlenPgm"
@@ -32,16 +42,17 @@
<cewolf:data>
<cewolf:producer id="strlenpgm_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.StrlenPgm}" />
+ <cewolf:param name="regex" value="<%=StrlenPgm%>" />
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="StrlenPgm" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="StrlenPgm" renderer="/cewolf" width="800"
height="800"/>
<P>
+ <% String VarargsPgm = ".*VarargsPgm.*"; %>
<jsp:useBean id="varargspgm_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="VarargsPgm"
@@ -53,15 +64,16 @@
<cewolf:data>
<cewolf:producer id="varargspgm_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.VarargsPgm}" />
+ <cewolf:param name="regex" value="<%=VarargsPgm%>" />
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="VarargsPgm" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="VarargsPgm" renderer="/cewolf" width="800"
height="800"/>
<P>
+ <% String VarretPgm = ".*VarretPgm.*"; %>
<jsp:useBean id="varretpgm_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="VarretPgm"
@@ -73,13 +85,13 @@
<cewolf:data>
<cewolf:producer id="varretpgm_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.VarretPgm}" />
+ <cewolf:param name="regex" value="<%=VarretPgm%>" />
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="VarretPgm" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="VarretPgm" renderer="/cewolf" width="800"
height="800"/>
<P>
</netui:body>
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp?view=diff&r1=153337&r2=153338
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
(original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
Thu Feb 10 19:54:22 2005
@@ -115,6 +115,8 @@
<netui:textBox dataSource="actionForm.filename"/>
Regex:
<netui:textBox dataSource="actionForm.regex"/>
+ Seriesname:
+ <netui:textBox dataSource="actionForm.seriesname"/>
X axis:
<netui:textBox dataSource="actionForm.xaxis"/>
X label:
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/series.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/series.jsp?view=diff&r1=153337&r2=153338
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/series.jsp
(original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/series.jsp
Thu Feb 10 19:54:22 2005
@@ -9,20 +9,19 @@
id="${requestScope.chartid}"
title="${requestScope.title}"
type="${requestScope.type}"
- showlegend="${false}"
xaxislabel="${requestScope.xlabel}"
yaxislabel="${requestScope.ylabel}">
<cewolf:data>
<cewolf:producer id="series_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.regex}"/>
+ <cewolf:param name="regexmap"
value="${requestScope.regexmap}"/>
<cewolf:param name="xaxis"
value="${requestScope.xaxis}"/>
<cewolf:param name="yaxis"
value="${requestScope.yaxis}"/>
</cewolf:producer>
</cewolf:data>
</cewolf:chart>
<p>
- <cewolf:img chartid="${requestScope.chartid}" renderer="cewolf"
width="${requestScope.width}" height="${requestScope.height}"/>
+ <cewolf:img chartid="${requestScope.chartid}"
renderer="/cewolf" width="${requestScope.width}"
height="${requestScope.height}"/>
<P>
</body>
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/snapshot.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/snapshot.jsp?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/snapshot.jsp
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/snapshot.jsp
Thu Feb 10 19:54:22 2005
@@ -24,7 +24,7 @@
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="${requestScope.chartid}" renderer="cewolf"
width="${requestScope.width}" height="${requestScope.height}"/>
+ <cewolf:img chartid="${requestScope.chartid}"
renderer="/cewolf" width="${requestScope.width}"
height="${requestScope.height}"/>
<P>
</body>
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp?view=diff&r1=153337&r2=153338
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
Thu Feb 10 19:54:22 2005
@@ -1,9 +1,22 @@
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+
+<[EMAIL PROTECTED] import="java.util.HashMap"%>
+
<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0";
prefix="netui-data"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0"; prefix="netui"%>
<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0";
prefix="netui-template"%>
<[EMAIL PROTECTED] uri='http://cewolf.sourceforge.net/taglib/cewolf.tld'
prefix='cewolf' %>
+
+<!-- global strings -->
+<%
+String g_sMemory = "memory";
+String g_sSize = "size";
+String g_sFlavor = "flavor";
+String g_sTime = "time";
+String g_sFilesize = "filesize";
+%>
+
<netui:html>
<head>
<title>report web</title>
@@ -18,9 +31,13 @@
<p>JVM: <netui:label value="${requestScope.jvm}"/>
<p>OS: <netui:label value="${requestScope.os}"/>
<p>Filename: <netui:label value="${requestScope.filename}"/>
-
+
+ <!-- chart postprocessor(s) -->
<jsp:useBean id="verticalxlabel"
class="graphing.postprocessors.VerticalXLabel"/>
+ <!-- Time Snapshot Plots -->
+
+ <% String CursorWalk = "CursorWalk.*";%>
<jsp:useBean id="cursorwalk_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="CursorWalk"
@@ -32,15 +49,16 @@
<cewolf:data>
<cewolf:producer id="cursorwalk_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.CursorWalk}" />
+ <cewolf:param name="regex" value="<%=CursorWalk%>" />
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="CursorWalk" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="CursorWalk" renderer="/cewolf" width="800"
height="800"/>
<P>
+ <% String CursorGetSetGet = "CursorGet.*";%>
<jsp:useBean id="cursorgetsetget_data"
class="graphing.SnapshotProducer"/>
<cewolf:chart
id="CursorGetSetGet"
@@ -52,15 +70,16 @@
<cewolf:data>
<cewolf:producer id="cursorgetsetget_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.CursorGetSetGet}" />
+ <cewolf:param name="regex" value="<%=CursorGetSetGet%>"
/>
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="CursorGetSetGet" renderer="cewolf"
width="800" height="800"/>
+ <cewolf:img chartid="CursorGetSetGet" renderer="/cewolf"
width="800" height="800"/>
<P>
+ <% String BisLoad = "BisLoad.*";%>
<jsp:useBean id="bisload_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="BisLoad"
@@ -72,15 +91,16 @@
<cewolf:data>
<cewolf:producer id="bisload_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.BisLoad}" />
+ <cewolf:param name="regex" value="<%=BisLoad%>" />
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="BisLoad" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="BisLoad" renderer="/cewolf" width="1000"
height="800"/>
<P>
+ <% String DomWalk = "DomWalk.*";%>
<jsp:useBean id="domwalk_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="DomWalk"
@@ -92,15 +112,16 @@
<cewolf:data>
<cewolf:producer id="domwalk_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.DomWalk}" />
+ <cewolf:param name="regex" value="<%=DomWalk%>" />
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="DomWalk" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="DomWalk" renderer="/cewolf" width="1000"
height="800"/>
<P>
+ <% String POValidate = "POValidate.*";%>
<jsp:useBean id="povalidate_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="POValidate"
@@ -112,15 +133,16 @@
<cewolf:data>
<cewolf:producer id="povalidate_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.POValidate}" />
+ <cewolf:param name="regex" value="<%=POValidate%>" />
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="POValidate" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="POValidate" renderer="/cewolf" width="800"
height="800"/>
<P>
+ <% String POTopDown = "POTopDown[^Save].*";%>
<jsp:useBean id="potopdown_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="POTopDown"
@@ -132,15 +154,16 @@
<cewolf:data>
<cewolf:producer id="potopdown_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.POTopDown}"/>
+ <cewolf:param name="regex" value="<%=POTopDown%>"/>
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="POTopDown" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="POTopDown" renderer="/cewolf" width="800"
height="800"/>
<P>
+ <% String POTopDownSave = "POTopDownSave.*";%>
<jsp:useBean id="potopdownsave_data"
class="graphing.SnapshotProducer"/>
<cewolf:chart
id="POTopDownSave"
@@ -152,15 +175,16 @@
<cewolf:data>
<cewolf:producer id="potopdownsave_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.POTopDownSave}"/>
+ <cewolf:param name="regex" value="<%=POTopDownSave%>"/>
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="POTopDownSave" renderer="cewolf"
width="800" height="800"/>
+ <cewolf:img chartid="POTopDownSave" renderer="/cewolf"
width="800" height="800"/>
<P>
+ <% String PrimTopDown = "PrimTopDown.*";%>
<jsp:useBean id="primtopdown_data" class="graphing.SnapshotProducer"/>
<cewolf:chart
id="PrimTopDown"
@@ -172,15 +196,16 @@
<cewolf:data>
<cewolf:producer id="primtopdown_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.PrimTopDown}"/>
+ <cewolf:param name="regex" value="<%=PrimTopDown%>"/>
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="PrimTopDown" renderer="cewolf" width="800"
height="800"/>
+ <cewolf:img chartid="PrimTopDown" renderer="/cewolf"
width="800" height="800"/>
<P>
+ <% String NPrimTopDown = "NPrimTopDown.*";%>
<jsp:useBean id="nprimtopdown_data"
class="graphing.SnapshotProducer"/>
<cewolf:chart
id="NPrimTopDown"
@@ -192,14 +217,100 @@
<cewolf:data>
<cewolf:producer id="nprimtopdown_data">
<cewolf:param name="filename"
value="${requestScope.filename}" />
- <cewolf:param name="regex"
value="${requestScope.NPrimTopDown}"/>
+ <cewolf:param name="regex" value="<%=NPrimTopDown%>"/>
</cewolf:producer>
</cewolf:data>
<cewolf:chartpostprocessor id="verticalxlabel"/>
</cewolf:chart>
<p>
- <cewolf:img chartid="NPrimTopDown" renderer="cewolf"
width="800" height="800"/>
+ <cewolf:img chartid="NPrimTopDown" renderer="/cewolf"
width="800" height="800"/>
+ <P>
+
+ <!-- Time Series Plots -->
+ <%
+ HashMap<String,String> POReadAll = new HashMap<String,String>();
+ POReadAll.put("POReadAllV2","POReadAllV2.*");
+ POReadAll.put("POReadAllV1","POReadAllV1.*");
+ //POReadAll.put("POReadAllCastor","POReadAllCastor.*");
+ POReadAll.put("POReadAllJaxb","POReadAllJaxb.*");
+ POReadAll.put("POReadAllJibx","POReadAllJibx.*");
+ %>
+ <jsp:useBean id="POReadAll_data" class="graphing.SeriesProducer"/>
+ <cewolf:chart
+ id="POReadAll"
+ title="Purchase Order Read All"
+ type="scatter"
+ xaxislabel="filesize(bytes)"
+ yaxislabel="time(ms)">
+ <cewolf:data>
+ <cewolf:producer id="POReadAll_data">
+ <cewolf:param name="filename"
value='${requestScope.filename}' />
+ <cewolf:param name="xaxis"
value="<%=g_sFilesize%>"/>
+ <cewolf:param name="yaxis"
value="<%=g_sTime%>"/>
+ <cewolf:param name="regexmap"
value="<%=POReadAll%>"/>
+ </cewolf:producer>
+ </cewolf:data>
+ </cewolf:chart>
+ <p>
+ <cewolf:img chartid="POReadAll" renderer="/cewolf" width="800"
height="800"/>
+ <P>
+
+
+ <!-- Memory Plots -->
+
+ <%
+ HashMap<String,String> MaxMemUntypedBisLoadDeepAttributes = new
HashMap<String,String>();
+
MaxMemUntypedBisLoadDeepAttributes.put("MaxMemUntypedBisLoadV2_deep-attributes","MaxMemUntypedBisLoadV2.*deep-attributes.*");
+
MaxMemUntypedBisLoadDeepAttributes.put("MaxMemUntypedBisLoadV1_deep-attributes","MaxMemUntypedBisLoadV1.*deep-attributes.*");
+
//MaxMemUntypedBisLoadDeepAttributes.put("MaxMemUntypedBisLoadCastor_deep-attributes","MaxMemUntypedBisLoadCastor.*deep-attributes.*");
+ %>
+ <jsp:useBean id="MaxMemUntypedBisLoadDeepAttributes_data"
class="graphing.SeriesProducer"/>
+ <cewolf:chart
+ id="MaxMemUntypedBisLoadDeepAttributes"
+ title="Maximum File Size vs. Memory (flavor=deep-attributes)"
+ type="xy"
+ xaxislabel="memory"
+ yaxislabel="size">
+ <cewolf:data>
+ <cewolf:producer
id="MaxMemUntypedBisLoadDeepAttributes_data">
+ <cewolf:param name="filename"
value='${requestScope.filename}' />
+ <cewolf:param name="xaxis"
value="<%=g_sMemory%>"/>
+ <cewolf:param name="yaxis"
value="<%=g_sSize%>"/>
+ <cewolf:param name="regexmap"
value="<%=MaxMemUntypedBisLoadDeepAttributes%>"/>
+ </cewolf:producer>
+ </cewolf:data>
+ </cewolf:chart>
+ <p>
+ <cewolf:img chartid="MaxMemUntypedBisLoadDeepAttributes"
renderer="/cewolf" width="800" height="800"/>
<P>
+
+
+ <%
+ HashMap<String,String> MaxMemUntypedBisLoadDeepElements = new
HashMap<String,String>();
+
MaxMemUntypedBisLoadDeepElements.put("MaxMemUntypedBisLoadV2_deep-elements","MaxMemUntypedBisLoadV2.*deep-elements.*");
+
MaxMemUntypedBisLoadDeepElements.put("MaxMemUntypedBisLoadV1_deep-elements","MaxMemUntypedBisLoadV1.*deep-elements.*");
+
//MaxMemUntypedBisLoadDeepElements.put("MaxMemUntypedBisLoadCastor_deep-elements","MaxMemUntypedBisLoadCastor.*deep-elements.*");
+ %>
+ <jsp:useBean id="MaxMemUntypedBisLoadDeepElements_data"
class="graphing.SeriesProducer"/>
+ <cewolf:chart
+ id="MaxMemUntypedBisLoadDeepElements"
+ title="Maximum File Size vs. Memory (flavor=deep-elements)"
+ type="scatter"
+ xaxislabel="memory"
+ yaxislabel="size">
+ <cewolf:data>
+ <cewolf:producer
id="MaxMemUntypedBisLoadDeepElements_data">
+ <cewolf:param name="filename"
value='${requestScope.filename}' />
+ <cewolf:param name="xaxis"
value="<%=g_sMemory%>"/>
+ <cewolf:param name="yaxis"
value="<%=g_sSize%>"/>
+ <cewolf:param name="regexmap"
value="<%=MaxMemUntypedBisLoadDeepElements%>"/>
+ </cewolf:producer>
+ </cewolf:data>
+ </cewolf:chart>
+ <p>
+ <cewolf:img chartid="MaxMemUntypedBisLoadDeepElements"
renderer="/cewolf" width="800" height="800"/>
+ <P>
+
</netui:body>
