curcuru 01/03/02 12:12:05
Modified: test/java/src/org/apache/qetest/xsl
PerfEverythingTestlet.java PerformanceTest.java
PerformanceTestlet.java PerfPreloadTestlet.java
Log:
Minor updates to improve logging; change Perf*Testlets
getDefaultDatalet to properly return a StylesheetDatalet instead
Revision Changes Path
1.3 +3 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/PerfEverythingTestlet.java
Index: PerfEverythingTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/PerfEverythingTestlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PerfEverythingTestlet.java 2001/03/01 22:30:12 1.2
+++ PerfEverythingTestlet.java 2001/03/02 20:11:27 1.3
@@ -78,7 +78,7 @@
* purposes, we really need to do it all here.
*
* @author [EMAIL PROTECTED]
- * @version $Id: PerfEverythingTestlet.java,v 1.2 2001/03/01 22:30:12
curcuru Exp $
+ * @version $Id: PerfEverythingTestlet.java,v 1.3 2001/03/02 20:11:27
curcuru Exp $
*/
public class PerfEverythingTestlet extends TestletImpl
{
@@ -86,7 +86,7 @@
static { thisClassName = "org.apache.qetest.xsl.PerfEverythingTestlet"; }
// Initialize our defaultDatalet
- { defaultDatalet = (Datalet)new PerformanceDatalet(); }
+ { defaultDatalet = (Datalet)new StylesheetDatalet(); }
/**
* Accesor method for a brief description of this test.
@@ -141,7 +141,7 @@
}
catch (ClassCastException e)
{
- logger.checkErr("Datalet provided is not a StylesheetDatalet;
cannot continue");
+ logger.checkErr("Incorrect Datalet type provided, threw:" +
e.toString());
return;
}
1.4 +20 -1
xml-xalan/test/java/src/org/apache/qetest/xsl/PerformanceTest.java
Index: PerformanceTest.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/PerformanceTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PerformanceTest.java 2001/01/08 18:54:18 1.3
+++ PerformanceTest.java 2001/03/02 20:11:36 1.4
@@ -68,6 +68,7 @@
import java.io.File;
import java.io.FilenameFilter;
+import java.util.Hashtable;
import java.util.Properties;
//-------------------------------------------------------------------------
@@ -219,6 +220,7 @@
String OutName)
{
+ long aggregate = 0L;
long fileTime = ProcessorWrapper.ERROR;
try
@@ -296,7 +298,6 @@
logMemory(true); // dumps Runtime.freeMemory/totalMemory
- long aggregate = 0L;
int j;
for (j = 1; j <= iterations; j++)
@@ -327,6 +328,24 @@
reporter.logPerfMsg(PERF_AVERAGE, (aggregate / iterations),
"Average of (" + iterations
+ ") iterations of::" + XSLName);
+ // Log special performance element with our timing
+ Hashtable attrs = new Hashtable();
+ // idref is the individual filename
+ attrs.put("idref", (new File(XSLName)).getName());
+ // inputName is the actual name we gave to the processor
+ attrs.put("inputName", XSLName);
+ // preload.onetime is the one time it took in the preload stage
+ if (preload)
+ attrs.put("singletransform", new Long(fileTime));
+ // process.avg is the average processing time...
+ attrs.put("avgetoe", new Long(aggregate / iterations));
+ // ... over a number of iterations
+ attrs.put("iterations", new Integer(iterations));
+ // The hackish buf at the end is simply a semicolon
+ // delimited list of individual timings, just for
+ // fun - I'm not even sure we're going to use it
+ logger.logElement(Logger.STATUSMSG, "perf", attrs,
PERF_ITERATION);
+
}
// Catch any throwable and log an error
1.4 +3 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/PerformanceTestlet.java
Index: PerformanceTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/PerformanceTestlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PerformanceTestlet.java 2001/02/26 21:49:52 1.3
+++ PerformanceTestlet.java 2001/03/02 20:11:40 1.4
@@ -71,7 +71,7 @@
* Testlet to capture basic timing performance data.
*
* @author [EMAIL PROTECTED]
- * @version $Id: PerformanceTestlet.java,v 1.3 2001/02/26 21:49:52 curcuru
Exp $
+ * @version $Id: PerformanceTestlet.java,v 1.4 2001/03/02 20:11:40 curcuru
Exp $
*/
public class PerformanceTestlet extends TestletImpl
{
@@ -79,7 +79,7 @@
static { thisClassName = "org.apache.qetest.xsl.PerformanceTestlet"; }
// Initialize our defaultDatalet
- { defaultDatalet = (Datalet)new PerformanceDatalet(); }
+ { defaultDatalet = (Datalet)new StylesheetDatalet(); }
/**
* Accesor method for a brief description of this test.
@@ -119,7 +119,7 @@
}
catch (ClassCastException e)
{
- logger.checkErr("Datalet provided is not a StylesheetDatalet;
cannot continue");
+ logger.checkErr("Incorrect Datalet type provided, threw:" +
e.toString());
return;
}
1.2 +3 -3
xml-xalan/test/java/src/org/apache/qetest/xsl/PerfPreloadTestlet.java
Index: PerfPreloadTestlet.java
===================================================================
RCS file:
/home/cvs/xml-xalan/test/java/src/org/apache/qetest/xsl/PerfPreloadTestlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PerfPreloadTestlet.java 2001/02/27 15:10:46 1.1
+++ PerfPreloadTestlet.java 2001/03/02 20:11:43 1.2
@@ -72,7 +72,7 @@
* precompiled/prebuilt stylesheets.
*
* @author [EMAIL PROTECTED]
- * @version $Id: PerfPreloadTestlet.java,v 1.1 2001/02/27 15:10:46 curcuru
Exp $
+ * @version $Id: PerfPreloadTestlet.java,v 1.2 2001/03/02 20:11:43 curcuru
Exp $
*/
public class PerfPreloadTestlet extends TestletImpl
{
@@ -80,7 +80,7 @@
static { thisClassName = "org.apache.qetest.xsl.PerfPreloadTestlet"; }
// Initialize our defaultDatalet
- { defaultDatalet = (Datalet)new PerformanceDatalet(); }
+ { defaultDatalet = (Datalet)new StylesheetDatalet(); }
/**
* Accesor method for a brief description of this test.
@@ -120,7 +120,7 @@
}
catch (ClassCastException e)
{
- logger.checkErr("Datalet provided is not a StylesheetDatalet;
cannot continue");
+ logger.checkErr("Incorrect Datalet type provided, threw:" +
e.toString());
return;
}
