xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkro...@apache.org
Subject svn commit: r125551 - in xmlbeans/trunk/test/perf: . bin src/org/apache/xmlbeans/test/performance/utils src/org/apache/xmlbeans/test/performance/v1 src/org/apache/xmlbeans/test/performance/v2
Date Tue, 18 Jan 2005 21:50:52 GMT
Author: kkrouse
Date: Tue Jan 18 13:50:50 2005
New Revision: 125551

URL: http://svn.apache.org/viewcvs?view=rev&rev=125551
Log:
mem perf tests
Contributed by Jamie Zyskowski

Added:
   xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v1/MaxMemUntypedBisLoadV1.java
   xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v2/MaxMemUntypedBisLoadV2.java
Modified:
   xmlbeans/trunk/test/perf/bin/castor.bat
   xmlbeans/trunk/test/perf/bin/jaxb.bat
   xmlbeans/trunk/test/perf/bin/jibx.bat
   xmlbeans/trunk/test/perf/bin/run_castor.bat
   xmlbeans/trunk/test/perf/bin/run_jaxb.bat
   xmlbeans/trunk/test/perf/bin/run_jibx.bat
   xmlbeans/trunk/test/perf/bin/run_v1.bat
   xmlbeans/trunk/test/perf/bin/run_v2.bat
   xmlbeans/trunk/test/perf/bin/run_xerces.bat
   xmlbeans/trunk/test/perf/bin/v1.bat
   xmlbeans/trunk/test/perf/bin/v2.bat
   xmlbeans/trunk/test/perf/bin/xerces.bat
   xmlbeans/trunk/test/perf/build.xml
   xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/Constants.java
   xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/PerfUtil.java

Modified: xmlbeans/trunk/test/perf/bin/castor.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/castor.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/castor.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/castor.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/castor.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/castor.bat	Tue Jan 18 13:50:50 2005
@@ -1 +1,60 @@
-java -Xmx64m -Xbootclasspath/p:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xml-apis.jar;%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xercesImpl.jar
-classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\castor-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\castor-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\castor-non-primitives.jar;%XMLBEANS_PERFROOT%\3rdparty\castor\castor-0.9.5.4.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.castor.%* 
+@echo off
+REM SUPPORTED PARAMS
+REM TODO: Make command line arg parsing cleaner
+set MEM=64
+set FLAVOR=
+set FILENAME=
+
+REM SCAN FIRST PARAM
+if not "%2"=="" goto %2
+goto default
+goto end
+:memory
+set MEM=%3
+goto end
+:flavor
+set FLAVOR=%3
+goto end
+:filename
+set FILENAME=%3
+goto end
+:default
+goto end
+:end
+
+REM SCAN SECOND PARAM
+if not "%4"=="" goto %4
+goto default
+goto end
+:memory
+set MEM=%5
+goto end
+:flavor
+set FLAVOR=%5
+goto end
+:filename
+set FILENAME=%5
+goto end
+:default
+goto end
+:end
+
+REM SCAN THIRD PARAM
+if not "%6"=="" goto %6
+goto default
+goto end
+:memory
+set MEM=%7
+goto end
+:flavor
+set FLAVOR=%7
+goto end
+:filename
+set FILENAME=%7
+goto end
+:default
+goto end
+:end
+
+echo on
+java -Xmx%MEM%m -Xbootclasspath/p:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xml-apis.jar;%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xercesImpl.jar
-classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\castor-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\castor-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\castor-non-primitives.jar;%XMLBEANS_PERFROOT%\3rdparty\castor\castor-0.9.5.4.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.castor.%1 %FLAVOR% %FILENAME%


Modified: xmlbeans/trunk/test/perf/bin/jaxb.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/jaxb.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/jaxb.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/jaxb.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/jaxb.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/jaxb.bat	Tue Jan 18 13:50:50 2005
@@ -1 +1,60 @@
-java -Xmx64m -Xbootclasspath/p:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xml-apis.jar:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xercesImpl.jar
-classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\jaxb-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\jaxb-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\jaxb-non-primitives.jar;%JAXB_LIBDIR%\jaxb-libs.jar;%JAXB_LIBDIR%\jaxb-impl.jar;%JAXB_LIBDIR%\jaxb-api.jar;%JAXB_LIBDIR%\relaxngDatatype.jar;%JAXB_LIBDIR%\xsdlib.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.jaxb.%* 
+@echo off
+REM SUPPORTED PARAMS
+REM TODO: Make command line arg parsing cleaner
+set MEM=64
+set FLAVOR=
+set FILENAME=
+
+REM SCAN FIRST PARAM
+if not "%2"=="" goto %2
+goto default
+goto end
+:memory
+set MEM=%3
+goto end
+:flavor
+set FLAVOR=%3
+goto end
+:filename
+set FILENAME=%3
+goto end
+:default
+goto end
+:end
+
+REM SCAN SECOND PARAM
+if not "%4"=="" goto %4
+goto default
+goto end
+:memory
+set MEM=%5
+goto end
+:flavor
+set FLAVOR=%5
+goto end
+:filename
+set FILENAME=%5
+goto end
+:default
+goto end
+:end
+
+REM SCAN THIRD PARAM
+if not "%6"=="" goto %6
+goto default
+goto end
+:memory
+set MEM=%7
+goto end
+:flavor
+set FLAVOR=%7
+goto end
+:filename
+set FILENAME=%7
+goto end
+:default
+goto end
+:end
+
+echo on
+java -Xmx%MEM%m -Xbootclasspath/p:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xml-apis.jar:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xercesImpl.jar
-classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\jaxb-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\jaxb-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\jaxb-non-primitives.jar;%JAXB_LIBDIR%\jaxb-libs.jar;%JAXB_LIBDIR%\jaxb-impl.jar;%JAXB_LIBDIR%\jaxb-api.jar;%JAXB_LIBDIR%\relaxngDatatype.jar;%JAXB_LIBDIR%\xsdlib.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.jaxb.%1 %FLAVOR% %FILENAME%


Modified: xmlbeans/trunk/test/perf/bin/jibx.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/jibx.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/jibx.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/jibx.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/jibx.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/jibx.bat	Tue Jan 18 13:50:50 2005
@@ -1 +1,60 @@
-java -Xmx64m -classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\jibx-purchase-order.jar;%XMLBEANS_PERFROOT%\3rdparty\jibx\jibx\lib\jibx-run.jar;%XMLBEANS_PERFROOT%\3rdparty\jibx\jibx\lib\xpp3.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.jibx.%* 
+@echo off
+REM SUPPORTED PARAMS
+REM TODO: Make command line arg parsing cleaner
+set MEM=64
+set FLAVOR=
+set FILENAME=
+
+REM SCAN FIRST PARAM
+if not "%2"=="" goto %2
+goto default
+goto end
+:memory
+set MEM=%3
+goto end
+:flavor
+set FLAVOR=%3
+goto end
+:filename
+set FILENAME=%3
+goto end
+:default
+goto end
+:end
+
+REM SCAN SECOND PARAM
+if not "%4"=="" goto %4
+goto default
+goto end
+:memory
+set MEM=%5
+goto end
+:flavor
+set FLAVOR=%5
+goto end
+:filename
+set FILENAME=%5
+goto end
+:default
+goto end
+:end
+
+REM SCAN THIRD PARAM
+if not "%6"=="" goto %6
+goto default
+goto end
+:memory
+set MEM=%7
+goto end
+:flavor
+set FLAVOR=%7
+goto end
+:filename
+set FILENAME=%7
+goto end
+:default
+goto end
+:end
+
+echo on
+java -Xmx%MEM%m -classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\jibx-purchase-order.jar;%XMLBEANS_PERFROOT%\3rdparty\jibx\jibx\lib\jibx-run.jar;%XMLBEANS_PERFROOT%\3rdparty\jibx\jibx\lib\xpp3.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.jibx.%1 %FLAVOR% %FILENAME%


Modified: xmlbeans/trunk/test/perf/bin/run_castor.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/run_castor.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/run_castor.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/run_castor.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/run_castor.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/run_castor.bat	Tue Jan 18 13:50:50 2005
@@ -1,17 +1,17 @@
-call castor.bat POReadAllCastor 1 
-call castor.bat POReadAllCastor 2 
-call castor.bat POReadAllCastor 3 
-call castor.bat POReadAllCastor 4 
-call castor.bat POReadAllCastor 5 
-call castor.bat POReadAllCastor 6 
-call castor.bat POReadAllCastor 7 
-call castor.bat POReadOneCastor 1
-call castor.bat POReadOneCastor 2
-call castor.bat POReadOneCastor 3
-call castor.bat POReadOneCastor 4
-call castor.bat POReadOneCastor 5
-call castor.bat POReadOneCastor 6
-call castor.bat POReadOneCastor 7
+call castor.bat POReadAllCastor filename 1 
+call castor.bat POReadAllCastor filename 2 
+call castor.bat POReadAllCastor filename 3 
+call castor.bat POReadAllCastor filename 4 
+call castor.bat POReadAllCastor filename 5 
+call castor.bat POReadAllCastor filename 6 
+call castor.bat POReadAllCastor filename 7 
+call castor.bat POReadOneCastor filename 1
+call castor.bat POReadOneCastor filename 2
+call castor.bat POReadOneCastor filename 3
+call castor.bat POReadOneCastor filename 4
+call castor.bat POReadOneCastor filename 5
+call castor.bat POReadOneCastor filename 6
+call castor.bat POReadOneCastor filename 7
 call castor.bat POTopDownCastor
 call castor.bat POTopDownSaveCastor
 call castor.bat PrimTopDownCastor

Modified: xmlbeans/trunk/test/perf/bin/run_jaxb.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/run_jaxb.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/run_jaxb.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/run_jaxb.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/run_jaxb.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/run_jaxb.bat	Tue Jan 18 13:50:50 2005
@@ -1,17 +1,17 @@
-call jaxb.bat POReadAllJaxb 1 
-call jaxb.bat POReadAllJaxb 2 
-call jaxb.bat POReadAllJaxb 3 
-call jaxb.bat POReadAllJaxb 4 
-call jaxb.bat POReadAllJaxb 5 
-call jaxb.bat POReadAllJaxb 6 
-call jaxb.bat POReadAllJaxb 7 
-call jaxb.bat POReadOneJaxb 1
-call jaxb.bat POReadOneJaxb 2
-call jaxb.bat POReadOneJaxb 3
-call jaxb.bat POReadOneJaxb 4
-call jaxb.bat POReadOneJaxb 5
-call jaxb.bat POReadOneJaxb 6
-call jaxb.bat POReadOneJaxb 7
+call jaxb.bat POReadAllJaxb filename 1 
+call jaxb.bat POReadAllJaxb filename 2 
+call jaxb.bat POReadAllJaxb filename 3 
+call jaxb.bat POReadAllJaxb filename 4 
+call jaxb.bat POReadAllJaxb filename 5 
+call jaxb.bat POReadAllJaxb filename 6 
+call jaxb.bat POReadAllJaxb filename 7 
+call jaxb.bat POReadOneJaxb filename 1
+call jaxb.bat POReadOneJaxb filename 2
+call jaxb.bat POReadOneJaxb filename 3
+call jaxb.bat POReadOneJaxb filename 4
+call jaxb.bat POReadOneJaxb filename 5
+call jaxb.bat POReadOneJaxb filename 6
+call jaxb.bat POReadOneJaxb filename 7
 call jaxb.bat POTopDownJaxb
 call jaxb.bat POTopDownSaveJaxb
 call jaxb.bat PrimTopDownJaxb

Modified: xmlbeans/trunk/test/perf/bin/run_jibx.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/run_jibx.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/run_jibx.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/run_jibx.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/run_jibx.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/run_jibx.bat	Tue Jan 18 13:50:50 2005
@@ -1,14 +1,14 @@
-call jibx.bat POReadAllJibx 1 
-call jibx.bat POReadAllJibx 2 
-call jibx.bat POReadAllJibx 3 
-call jibx.bat POReadAllJibx 4 
-call jibx.bat POReadAllJibx 5 
-call jibx.bat POReadAllJibx 6 
-call jibx.bat POReadAllJibx 7 
-call jibx.bat POReadOneJibx 1 
-call jibx.bat POReadOneJibx 2 
-call jibx.bat POReadOneJibx 3 
-call jibx.bat POReadOneJibx 4 
-call jibx.bat POReadOneJibx 5 
-call jibx.bat POReadOneJibx 6 
-call jibx.bat POReadOneJibx 7 
+call jibx.bat POReadAllJibx filename 1 
+call jibx.bat POReadAllJibx filename 2 
+call jibx.bat POReadAllJibx filename 3 
+call jibx.bat POReadAllJibx filename 4 
+call jibx.bat POReadAllJibx filename 5 
+call jibx.bat POReadAllJibx filename 6 
+call jibx.bat POReadAllJibx filename 7 
+call jibx.bat POReadOneJibx filename 1 
+call jibx.bat POReadOneJibx filename 2 
+call jibx.bat POReadOneJibx filename 3 
+call jibx.bat POReadOneJibx filename 4 
+call jibx.bat POReadOneJibx filename 5 
+call jibx.bat POReadOneJibx filename 6 
+call jibx.bat POReadOneJibx filename 7 

Modified: xmlbeans/trunk/test/perf/bin/run_v1.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/run_v1.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/run_v1.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/run_v1.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/run_v1.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/run_v1.bat	Tue Jan 18 13:50:50 2005
@@ -1,90 +1,65 @@
-echo off
-call v1.bat POReadAllV1 1 
-echo
-call v1.bat POReadAllV1 2 
-echo
-call v1.bat POReadAllV1 3 
-echo
-call v1.bat POReadAllV1 4 
-echo
-call v1.bat POReadAllV1 5 
-echo
-call v1.bat POReadAllV1 6 
-echo
-call v1.bat POReadAllV1 7 
-echo
-call v1.bat POReadOneV1 1
-echo
-call v1.bat POReadOneV1 2
-echo
-call v1.bat POReadOneV1 3
-echo
-call v1.bat POReadOneV1 4
-echo
-call v1.bat POReadOneV1 5
-echo
-call v1.bat POReadOneV1 6
-echo
-call v1.bat POReadOneV1 7
-echo
+call v1.bat POReadAllV1 filename 1 
+call v1.bat POReadAllV1 filename 2 
+call v1.bat POReadAllV1 filename 3 
+call v1.bat POReadAllV1 filename 4 
+call v1.bat POReadAllV1 filename 5 
+call v1.bat POReadAllV1 filename 6 
+call v1.bat POReadAllV1 filename 7 
+call v1.bat POReadOneV1 filename 1
+call v1.bat POReadOneV1 filename 2
+call v1.bat POReadOneV1 filename 3
+call v1.bat POReadOneV1 filename 4
+call v1.bat POReadOneV1 filename 5
+call v1.bat POReadOneV1 filename 6
+call v1.bat POReadOneV1 filename 7
 call v1.bat POTopDownV1
-echo
 call v1.bat POTopDownSaveV1
-echo
 call v1.bat POValidateXmlObjV1
-echo
 call v1.bat PrimTopDownV1
-echo 
 call v1.bat NPrimTopDownV1
-echo 
-call v1.bat CursorWalkV1 deep-attributes
-echo
-call v1.bat CursorWalkV1 deep-elements
-echo 
-call v1.bat CursorWalkV1 wide-attributes
-echo
-call v1.bat CursorWalkV1 wide-elements
-echo
-call v1.bat CursorWalkV1 wide-text
-echo
-call v1.bat CursorGetAttributeV1 deep-attributes
-echo
-call v1.bat CursorGetAttributeV1 wide-attributes
-echo
-call v1.bat CursorGetSetGetAttributeV1 deep-attributes
-echo
-call v1.bat CursorGetSetGetAttributeV1 wide-attributes
-echo
+call v1.bat CursorWalkV1 flavor deep-attributes
+call v1.bat CursorWalkV1 flavor deep-elements
+call v1.bat CursorWalkV1 flavor wide-attributes
+call v1.bat CursorWalkV1 flavor wide-elements
+call v1.bat CursorWalkV1 flavor wide-text
+call v1.bat CursorGetAttributeV1 flavor deep-attributes
+call v1.bat CursorGetAttributeV1 flavor wide-attributes
+call v1.bat CursorGetSetGetAttributeV1 flavor deep-attributes
+call v1.bat CursorGetSetGetAttributeV1 flavor wide-attributes
 call v1.bat CursorGetElementV1
-echo
 call v1.bat CursorGetSetGetElementV1
-echo
-call v1.bat BisLoadV1 deep-attributes
-echo 
-call v1.bat BisLoadV1 deep-elements
-echo 
-call v1.bat BisLoadV1 wide-attributes
-echo 
-call v1.bat BisLoadV1 wide-elements
-echo 
-call v1.bat BisLoadV1 wide-text
-echo 
-call v1.bat DomWalkV1 deep-attributes
-echo
-call v1.bat DomWalkV1 deep-elements
-echo
-call v1.bat DomWalkV1 wide-attributes
-echo
-call v1.bat DomWalkV1 wide-elements
-echo
-call v1.bat DomWalkV1 wide-text
-echo
-call v1.bat DomWalkNLV1 deep-attributes
-echo
-call v1.bat DomWalkNLV1 deep-elements
-echo
-call v1.bat DomWalkNLV1 wide-attributes
-echo
-call v1.bat DomWalkNLV1 wide-elements
-echo
-call v1.bat DomWalkNLV1 wide-text
+call v1.bat BisLoadV1 flavor deep-attributes
+call v1.bat BisLoadV1 flavor deep-elements
+call v1.bat BisLoadV1 flavor wide-attributes
+call v1.bat BisLoadV1 flavor wide-elements
+call v1.bat BisLoadV1 flavor wide-text
+call v1.bat DomWalkV1 flavor deep-attributes
+call v1.bat DomWalkV1 flavor deep-elements
+call v1.bat DomWalkV1 flavor wide-attributes
+call v1.bat DomWalkV1 flavor wide-elements
+call v1.bat DomWalkV1 flavor wide-text
+call v1.bat DomWalkNLV1 flavor deep-attributes
+call v1.bat DomWalkNLV1 flavor deep-elements
+call v1.bat DomWalkNLV1 flavor wide-attributes
+call v1.bat DomWalkNLV1 flavor wide-elements
+call v1.bat DomWalkNLV1 flavor wide-text
+call v1.bat MaxMemUntypedBisLoadV1 memory 64 flavor deep-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 128 flavor deep-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 256 flavor deep-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 512 flavor deep-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 64 flavor deep-elements
+call v1.bat MaxMemUntypedBisLoadV1 memory 128 flavor deep-elements
+call v1.bat MaxMemUntypedBisLoadV1 memory 256 flavor deep-elements
+call v1.bat MaxMemUntypedBisLoadV1 memory 512 flavor deep-elements
+call v1.bat MaxMemUntypedBisLoadV1 memory 64 flavor wide-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 128 flavor wide-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 256 flavor wide-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 512 flavor wide-attributes
+call v1.bat MaxMemUntypedBisLoadV1 memory 64 flavor wide-text
+call v1.bat MaxMemUntypedBisLoadV1 memory 128 flavor wide-text
+call v1.bat MaxMemUntypedBisLoadV1 memory 256 flavor wide-text
+call v1.bat MaxMemUntypedBisLoadV1 memory 512 flavor wide-text
+call v1.bat MaxMemUntypedBisLoadV1 memory 64 flavor wide-text
+call v1.bat MaxMemUntypedBisLoadV1 memory 128 flavor wide-elements
+call v1.bat MaxMemUntypedBisLoadV1 memory 256 flavor wide-elements
+call v1.bat MaxMemUntypedBisLoadV1 memory 512 flavor wide-elements

Modified: xmlbeans/trunk/test/perf/bin/run_v2.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/run_v2.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/run_v2.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/run_v2.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/run_v2.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/run_v2.bat	Tue Jan 18 13:50:50 2005
@@ -1,90 +1,65 @@
-echo off
-call v2.bat POReadAllV2 1 
-echo
-call v2.bat POReadAllV2 2 
-echo
-call v2.bat POReadAllV2 3 
-echo
-call v2.bat POReadAllV2 4 
-echo
-call v2.bat POReadAllV2 5 
-echo
-call v2.bat POReadAllV2 6 
-echo
-call v2.bat POReadAllV2 7 
-echo
-call v2.bat POReadOneV2 1
-echo
-call v2.bat POReadOneV2 2
-echo
-call v2.bat POReadOneV2 3
-echo
-call v2.bat POReadOneV2 4
-echo
-call v2.bat POReadOneV2 5
-echo
-call v2.bat POReadOneV2 6
-echo
-call v2.bat POReadOneV2 7
-echo
+call v2.bat POReadAllV2 filename 1 
+call v2.bat POReadAllV2 filename 2 
+call v2.bat POReadAllV2 filename 3 
+call v2.bat POReadAllV2 filename 4 
+call v2.bat POReadAllV2 filename 5 
+call v2.bat POReadAllV2 filename 6 
+call v2.bat POReadAllV2 filename 7 
+call v2.bat POReadOneV2 filename 1
+call v2.bat POReadOneV2 filename 2
+call v2.bat POReadOneV2 filename 3
+call v2.bat POReadOneV2 filename 4
+call v2.bat POReadOneV2 filename 5
+call v2.bat POReadOneV2 filename 6
+call v2.bat POReadOneV2 filename 7
 call v2.bat POTopDownV2
-echo
 call v2.bat POTopDownSaveV2
-echo
 call v2.bat POValidateXmlObjV2
-echo
 call v2.bat PrimTopDownV2
-echo 
 call v2.bat NPrimTopDownV2
-echo 
-call v2.bat CursorWalkV2 deep-attributes
-echo
-call v2.bat CursorWalkV2 deep-elements
-echo 
-call v2.bat CursorWalkV2 wide-attributes
-echo
-call v2.bat CursorWalkV2 wide-elements
-echo
-call v2.bat CursorWalkV2 wide-text
-echo
-call v2.bat CursorGetAttributeV2 deep-attributes
-echo
-call v2.bat CursorGetAttributeV2 wide-attributes
-echo
-call v2.bat CursorGetSetGetAttributeV2 deep-attributes
-echo
-call v2.bat CursorGetSetGetAttributeV2 wide-attributes
-echo
+call v2.bat CursorWalkV2 flavor deep-attributes
+call v2.bat CursorWalkV2 flavor deep-elements
+call v2.bat CursorWalkV2 flavor wide-attributes
+call v2.bat CursorWalkV2 flavor wide-elements
+call v2.bat CursorWalkV2 flavor wide-text
+call v2.bat CursorGetAttributeV2 flavor deep-attributes
+call v2.bat CursorGetAttributeV2 flavor wide-attributes
+call v2.bat CursorGetSetGetAttributeV2 flavor deep-attributes
+call v2.bat CursorGetSetGetAttributeV2 flavor wide-attributes
 call v2.bat CursorGetElementV2
-echo
 call v2.bat CursorGetSetGetElementV2
-echo
-call v2.bat BisLoadV2 deep-attributes
-echo 
-call v2.bat BisLoadV2 deep-elements
-echo 
-call v2.bat BisLoadV2 wide-attributes
-echo 
-call v2.bat BisLoadV2 wide-elements
-echo 
-call v2.bat BisLoadV2 wide-text
-echo 
-call v2.bat DomWalkV2 deep-attributes
-echo
-call v2.bat DomWalkV2 deep-elements
-echo
-call v2.bat DomWalkV2 wide-attributes
-echo
-call v2.bat DomWalkV2 wide-elements
-echo
-call v2.bat DomWalkV2 wide-text
-echo
-call v2.bat DomWalkNLV2 deep-attributes
-echo
-call v2.bat DomWalkNLV2 deep-elements
-echo
-call v2.bat DomWalkNLV2 wide-attributes
-echo
-call v2.bat DomWalkNLV2 wide-elements
-echo
-call v2.bat DomWalkNLV2 wide-text
+call v2.bat BisLoadV2 flavor deep-attributes
+call v2.bat BisLoadV2 flavor deep-elements
+call v2.bat BisLoadV2 flavor wide-attributes
+call v2.bat BisLoadV2 flavor wide-elements
+call v2.bat BisLoadV2 flavor wide-text
+call v2.bat DomWalkV2 flavor deep-attributes
+call v2.bat DomWalkV2 flavor deep-elements
+call v2.bat DomWalkV2 flavor wide-attributes
+call v2.bat DomWalkV2 flavor wide-elements
+call v2.bat DomWalkV2 flavor wide-text
+call v2.bat DomWalkNLV2 flavor deep-attributes
+call v2.bat DomWalkNLV2 flavor deep-elements
+call v2.bat DomWalkNLV2 flavor wide-attributes
+call v2.bat DomWalkNLV2 flavor wide-elements
+call v2.bat DomWalkNLV2 flavor wide-text
+call v2.bat MaxMemUntypedBisLoadV2 memory 64 flavor deep-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 128 flavor deep-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 256 flavor deep-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 512 flavor deep-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 64 flavor deep-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 128 flavor deep-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 256 flavor deep-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 512 flavor deep-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 64 flavor wide-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 128 flavor wide-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 256 flavor wide-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 512 flavor wide-attributes
+call v2.bat MaxMemUntypedBisLoadV2 memory 64 flavor wide-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 128 flavor wide-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 256 flavor wide-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 512 flavor wide-elements
+call v2.bat MaxMemUntypedBisLoadV2 memory 64 flavor wide-text
+call v2.bat MaxMemUntypedBisLoadV2 memory 128 flavor wide-text
+call v2.bat MaxMemUntypedBisLoadV2 memory 256 flavor wide-text
+call v2.bat MaxMemUntypedBisLoadV2 memory 512 flavor wide-text

Modified: xmlbeans/trunk/test/perf/bin/run_xerces.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/run_xerces.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/run_xerces.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/run_xerces.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/run_xerces.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/run_xerces.bat	Tue Jan 18 13:50:50 2005
@@ -1,51 +1,51 @@
-call xerces.bat POReadAllXercesSax 1 
-call xerces.bat POReadAllXercesDom 1 
-call xerces.bat POReadAllXercesSax 2 
-call xerces.bat POReadAllXercesDom 2 
-call xerces.bat POReadAllXercesSax 3 
-call xerces.bat POReadAllXercesDom 3 
-call xerces.bat POReadAllXercesSax 4 
-call xerces.bat POReadAllXercesDom 4 
-call xerces.bat POReadAllXercesSax 5 
-call xerces.bat POReadAllXercesDom 5 
-call xerces.bat POReadAllXercesSax 6 
-call xerces.bat POReadAllXercesDom 6 
-call xerces.bat POReadAllXercesSax 7 
-call xerces.bat POReadAllXercesDom 7 
-call xerces.bat POReadOneXercesSax 1 
-call xerces.bat POReadOneXercesDom 1 
-call xerces.bat POReadOneXercesSax 2 
-call xerces.bat POReadOneXercesDom 2 
-call xerces.bat POReadOneXercesSax 3 
-call xerces.bat POReadOneXercesDom 3 
-call xerces.bat POReadOneXercesSax 4 
-call xerces.bat POReadOneXercesDom 4 
-call xerces.bat POReadOneXercesSax 5 
-call xerces.bat POReadOneXercesDom 5 
-call xerces.bat POReadOneXercesSax 6 
-call xerces.bat POReadOneXercesDom 6 
-call xerces.bat POReadOneXercesSax 7 
-call xerces.bat POReadOneXercesDom 7 
+call xerces.bat POReadAllXercesSax filename 1 
+call xerces.bat POReadAllXercesDom filename 1 
+call xerces.bat POReadAllXercesSax filename 2 
+call xerces.bat POReadAllXercesDom filename 2 
+call xerces.bat POReadAllXercesSax filename 3 
+call xerces.bat POReadAllXercesDom filename 3 
+call xerces.bat POReadAllXercesSax filename 4 
+call xerces.bat POReadAllXercesDom filename 4 
+call xerces.bat POReadAllXercesSax filename 5 
+call xerces.bat POReadAllXercesDom filename 5 
+call xerces.bat POReadAllXercesSax filename 6 
+call xerces.bat POReadAllXercesDom filename 6 
+call xerces.bat POReadAllXercesSax filename 7 
+call xerces.bat POReadAllXercesDom filename 7 
+call xerces.bat POReadOneXercesSax filename 1 
+call xerces.bat POReadOneXercesDom filename 1 
+call xerces.bat POReadOneXercesSax filename 2 
+call xerces.bat POReadOneXercesDom filename 2 
+call xerces.bat POReadOneXercesSax filename 3 
+call xerces.bat POReadOneXercesDom filename 3 
+call xerces.bat POReadOneXercesSax filename 4 
+call xerces.bat POReadOneXercesDom filename 4 
+call xerces.bat POReadOneXercesSax filename 5 
+call xerces.bat POReadOneXercesDom filename 5 
+call xerces.bat POReadOneXercesSax filename 6 
+call xerces.bat POReadOneXercesDom filename 6 
+call xerces.bat POReadOneXercesSax filename 7 
+call xerces.bat POReadOneXercesDom filename 7 
 call xerces.bat POTopDownXercesSax
 call xerces.bat POTopDownXercesDom
 call xerces.bat POValidateXerces
-call xerces.bat BisLoadXercesDom deep-attributes
-call xerces.bat BisLoadXercesSax deep-attributes
-call xerces.bat BisLoadXercesDom deep-elements
-call xerces.bat BisLoadXercesSax deep-elements
-call xerces.bat BisLoadXercesDom wide-attributes
-call xerces.bat BisLoadXercesSax wide-attributes
-call xerces.bat BisLoadXercesDom wide-elements
-call xerces.bat BisLoadXercesSax wide-elements
-call xerces.bat BisLoadXercesDom wide-text 
-call xerces.bat BisLoadXercesSax wide-text
-call xerces.bat DomWalkXerces deep-attributes
-call xerces.bat DomWalkXerces deep-elements
-call xerces.bat DomWalkXerces wide-attributes
-call xerces.bat DomWalkXerces wide-elements
-call xerces.bat DomWalkXerces wide-text
-call xerces.bat DomWalkNLXerces deep-attributes
-call xerces.bat DomWalkNLXerces deep-elements
-call xerces.bat DomWalkNLXerces wide-attributes
-call xerces.bat DomWalkNLXerces wide-elements
-call xerces.bat DomWalkNLXerces wide-text
+call xerces.bat BisLoadXercesDom flavor deep-attributes
+call xerces.bat BisLoadXercesSax flavor deep-attributes
+call xerces.bat BisLoadXercesDom flavor deep-elements
+call xerces.bat BisLoadXercesSax flavor deep-elements
+call xerces.bat BisLoadXercesDom flavor wide-attributes
+call xerces.bat BisLoadXercesSax flavor wide-attributes
+call xerces.bat BisLoadXercesDom flavor wide-elements
+call xerces.bat BisLoadXercesSax flavor wide-elements
+call xerces.bat BisLoadXercesDom flavor wide-text 
+call xerces.bat BisLoadXercesSax flavor wide-text
+call xerces.bat DomWalkXerces flavor deep-attributes
+call xerces.bat DomWalkXerces flavor deep-elements
+call xerces.bat DomWalkXerces flavor wide-attributes
+call xerces.bat DomWalkXerces flavor wide-elements
+call xerces.bat DomWalkXerces flavor wide-text
+call xerces.bat DomWalkNLXerces flavor deep-attributes
+call xerces.bat DomWalkNLXerces flavor deep-elements
+call xerces.bat DomWalkNLXerces flavor wide-attributes
+call xerces.bat DomWalkNLXerces flavor wide-elements
+call xerces.bat DomWalkNLXerces flavor wide-text

Modified: xmlbeans/trunk/test/perf/bin/v1.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/v1.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/v1.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/v1.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/v1.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/v1.bat	Tue Jan 18 13:50:50 2005
@@ -1,3 +1,61 @@
+@echo off
+REM SUPPORTED PARAMS
+REM TODO: Make command line arg parsing cleaner
+set MEM=64
+set FLAVOR=
+set FILENAME=
 set V1_LIB=%XMLBEANS_PERFROOT%\3rdparty\v1\xmlbeans-1.0.3\lib
 
-java -Xmx64m -classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\v1-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\v1-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\v1-non-primitives.jar;%V1_LIB%\xbean.jar;%XMLBEANS_HOME%\external\lib\piccolo_apache_dist_20040629_v2.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.v1.%* 
+REM SCAN FIRST PARAM
+if not "%2"=="" goto %2
+goto default
+goto end
+:memory
+set MEM=%3
+goto end
+:flavor
+set FLAVOR=%3
+goto end
+:filename
+set FILENAME=%3
+goto end
+:default
+goto end
+:end
+
+REM SCAN SECOND PARAM
+if not "%4"=="" goto %4
+goto default
+goto end
+:memory
+set MEM=%5
+goto end
+:flavor
+set FLAVOR=%5
+goto end
+:filename
+set FILENAME=%5
+goto end
+:default
+goto end
+:end
+
+REM SCAN THIRD PARAM
+if not "%6"=="" goto %6
+goto default
+goto end
+:memory
+set MEM=%7
+goto end
+:flavor
+set FLAVOR=%7
+goto end
+:filename
+set FILENAME=%7
+goto end
+:default
+goto end
+:end
+
+echo on
+java -Xmx%MEM%m -classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\v1-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\v1-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\v1-non-primitives.jar;%V1_LIB%\xbean.jar;%XMLBEANS_HOME%\external\lib\piccolo_apache_dist_20040629_v2.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.v1.%1 %FLAVOR% %FILENAME%


Modified: xmlbeans/trunk/test/perf/bin/v2.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/v2.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/v2.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/v2.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/v2.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/v2.bat	Tue Jan 18 13:50:50 2005
@@ -1 +1,60 @@
-java -Xmx64m -classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\v2-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\v2-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\v2-non-primitives.jar;%XMLBEANS_HOME%\build\lib\xbean.jar;%XMLBEANS_HOME%\build\lib\jsr173_api.jar;%XMLBEANS_HOME%\external\lib\piccolo_apache_dist_20040629_v2.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.v2.%* 
+@echo off
+REM SUPPORTED PARAMS
+REM TODO: Make command line arg parsing cleaner
+set MEM=64
+set FLAVOR=
+set FILENAME=
+
+REM SCAN FIRST PARAM
+if not "%2"=="" goto %2
+goto default
+goto end
+:memory
+set MEM=%3
+goto end
+:flavor
+set FLAVOR=%3
+goto end
+:filename
+set FILENAME=%3
+goto end
+:default
+goto end
+:end
+
+REM SCAN SECOND PARAM
+if not "%4"=="" goto %4
+goto default
+goto end
+:memory
+set MEM=%5
+goto end
+:flavor
+set FLAVOR=%5
+goto end
+:filename
+set FILENAME=%5
+goto end
+:default
+goto end
+:end
+
+REM SCAN THIRD PARAM
+if not "%6"=="" goto %6
+goto default
+goto end
+:memory
+set MEM=%7
+goto end
+:flavor
+set FLAVOR=%7
+goto end
+:filename
+set FILENAME=%7
+goto end
+:default
+goto end
+:end
+
+echo on
+java -Xmx%MEM%m -classpath %XMLBEANS_PERFROOT%\build;%XMLBEANS_PERFROOT%\schema_build\v2-purchase-order.jar;%XMLBEANS_PERFROOT%\schema_build\v2-primitives.jar;%XMLBEANS_PERFROOT%\schema_build\v2-non-primitives.jar;%XMLBEANS_HOME%\build\lib\xbean.jar;%XMLBEANS_HOME%\build\lib\jsr173_api.jar;%XMLBEANS_HOME%\external\lib\piccolo_apache_dist_20040629_v2.jar
-DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.v2.%1 %FLAVOR% %FILENAME%

Modified: xmlbeans/trunk/test/perf/bin/xerces.bat
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/bin/xerces.bat?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/bin/xerces.bat&r1=125550&p2=xmlbeans/trunk/test/perf/bin/xerces.bat&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/bin/xerces.bat	(original)
+++ xmlbeans/trunk/test/perf/bin/xerces.bat	Tue Jan 18 13:50:50 2005
@@ -1 +1,60 @@
-java -Xmx64m -Xbootclasspath/p:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xml-apis.jar;%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xercesImpl.jar
-classpath %XMLBEANS_PERFROOT%\build -DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.xerces.%*

+@echo off
+REM SUPPORTED PARAMS
+REM TODO: Make command line arg parsing cleaner
+set MEM=64
+set FLAVOR=
+set FILENAME=
+
+REM SCAN FIRST PARAM
+if not "%2"=="" goto %2
+goto default
+goto end
+:memory
+set MEM=%3
+goto end
+:flavor
+set FLAVOR=%3
+goto end
+:filename
+set FILENAME=%3
+goto end
+:default
+goto end
+:end
+
+REM SCAN SECOND PARAM
+if not "%4"=="" goto %4
+goto default
+goto end
+:memory
+set MEM=%5
+goto end
+:flavor
+set FLAVOR=%5
+goto end
+:filename
+set FILENAME=%5
+goto end
+:default
+goto end
+:end
+
+REM SCAN THIRD PARAM
+if not "%6"=="" goto %6
+goto default
+goto end
+:memory
+set MEM=%7
+goto end
+:flavor
+set FLAVOR=%7
+goto end
+:filename
+set FILENAME=%7
+goto end
+:default
+goto end
+:end
+
+echo on
+java -Xmx%MEM%m -Xbootclasspath/p:%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xml-apis.jar;%XMLBEANS_PERFROOT%\3rdparty\xerces\xerces-2_6_2\xercesImpl.jar
-classpath %XMLBEANS_PERFROOT%\build -DPERF_ROOT=%XMLBEANS_PERFROOT% org.apache.xmlbeans.test.performance.xerces.%1
%FLAVOR% %FILENAME% 

Modified: xmlbeans/trunk/test/perf/build.xml
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/build.xml?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/build.xml&r1=125550&p2=xmlbeans/trunk/test/perf/build.xml&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/build.xml	(original)
+++ xmlbeans/trunk/test/perf/build.xml	Tue Jan 18 13:50:50 2005
@@ -34,7 +34,6 @@
 
 	<!-- root properties used for finding everything -->
 	<property name="xmlbeans.perf.root" value="${basedir}"/>
-	<!-- TODO: CVS point to relative v2 build -->
 	<property name="v2.xmlbeans.root" value="${env.XMLBEANS_HOME}"/>
 
 	<property name="src.dir" value="${xmlbeans.perf.root}/src"/>
@@ -47,8 +46,7 @@
 
 	<!-- benchmark directories -->
 	<property name="v2.dir" value="${v2.xmlbeans.root}"/>
-	<!-- TODO: CVS - point to relative v1 line -->
-    <property name="v1.dir" value="${3rdparty.dir}/v1"/>
+  <property name="v1.dir" value="${3rdparty.dir}/v1"/>
 	<property name="castor.dir" value="${3rdparty.dir}/castor"/>
 	<property name="jibx.dir" value="${3rdparty.dir}/jibx"/>
 	<property name="xerces.dir" value="${3rdparty.dir}/xerces"/>
@@ -56,7 +54,6 @@
 	<property name="jaxb.dir" value="${env.JAXB_LIBDIR}"/>
 
 	<!-- castor -->
-	<!-- TODO: CVS - crack castor jar and turn off validation -->
 	<property name="castor.jar" value="${castor.dir}/castor-0.9.5.4.jar"/>
 	<property name="castor.url" value="ftp://ftp.exolab.org/pub/castor/castor_0.9.5.4/castor-0.9.5.4.jar"/>
 
@@ -104,6 +101,7 @@
 		<pathelement path="${v2-purchase-order.jar}"/>
 		<pathelement path="${v2-primitives.jar}"/>
 		<pathelement path="${v2-non-primitives.jar}"/>
+		<pathelement path="${v2-netui-config.jar}"/>
 		<pathelement path="${build.dir}"/>
 		<pathelement path="${perf-results.jar}"/>
 	</path>
@@ -373,7 +371,6 @@
 					output="${temp.dir}/scomp_output.txt">
 			<env key="XMLBEANS_HOME" value="${v2.xmlbeans.root}"/>
 			<arg line="-out ${jar.name}"/>
-			<arg line="-d ${temp.dir}"/>
 			<arg line="${test.case.dir}/xsd/${xsd.name}"/>
 		</exec>
 		<copy file="${temp.dir}/${jar.name}" todir="${schema.jar.build.dir}"/>

Modified: xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/Constants.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/Constants.java?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/Constants.java&r1=125550&p2=xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/Constants.java&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/Constants.java
(original)
+++ xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/Constants.java
Tue Jan 18 13:50:50 2005
@@ -103,4 +103,11 @@
   public static final BigInteger myNegBigInteger = new BigInteger("-987654321");
   public static final GregorianCalendar myDate = new GregorianCalendar();
   public static final String myString = "hello world!";
+  
+  // memory scenario values
+  public static final int MEM_INTERVAL = 100000;
+  public static final int MEM_INITIALSIZE = 4000000;
+  
+  // netui config xsd for real-world example
+  public static final String NETUI_CONFIG_INSTANCE = XSD_DIR+P+"netui-config.xml";
 }

Modified: xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/PerfUtil.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/PerfUtil.java?view=diff&rev=125551&p1=xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/PerfUtil.java&r1=125550&p2=xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/PerfUtil.java&r2=125551
==============================================================================
--- xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/PerfUtil.java
(original)
+++ xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/utils/PerfUtil.java
Tue Jan 18 13:50:50 2005
@@ -25,14 +25,14 @@
 
 public class PerfUtil
 {
-  public float getMemoryUsageMb(){
+  /*public float getMemoryUsageMb(){
     System.runFinalization();
     System.gc();
     try{Thread.currentThread().sleep(4000);}catch(InterruptedException ie){}
     Runtime runtime = Runtime.getRuntime();
     float result = ((float) runtime.totalMemory() - runtime.freeMemory())/(1024*1024);
     return result;
-  }
+  }*/
 
   // TODO: add more flavors
   public char[] createXmlData(String flavor, int size){
@@ -93,7 +93,7 @@
       }
       buff.append(rootEnd);
     }
-    System.out.println("num chars: "+buff.length());
+    //System.out.println("num chars: "+buff.length());
     return buff.toString().toCharArray();
   }
 

Added: xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v1/MaxMemUntypedBisLoadV1.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v1/MaxMemUntypedBisLoadV1.java?view=auto&rev=125551
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v1/MaxMemUntypedBisLoadV1.java
Tue Jan 18 13:50:50 2005
@@ -0,0 +1,76 @@
+/*   Copyright 2004 The Apache Software Foundation
+*
+*   Licensed under the Apache License, Version 2.0 (the "License");
+*   you may not use this file except in compliance with the License.
+*   You may obtain a copy of the License at
+*
+*       http://www.apache.org/licenses/LICENSE-2.0
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package org.apache.xmlbeans.test.performance.v1;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.test.performance.utils.Constants;
+import org.apache.xmlbeans.test.performance.utils.PerfUtil;
+
+
+public class MaxMemUntypedBisLoadV1
+{
+ 
+  public static void main(String[] args) throws Exception
+  {
+  	int interval = Constants.MEM_INTERVAL;
+  	long memory = Runtime.getRuntime().maxMemory();
+  	int size = 0;
+  	int hash = 0;
+    String flavor = null;
+
+    if(args.length == 0)
+      flavor = "deep-attributes";
+    else
+      flavor = args[0];
+
+    MaxMemUntypedBisLoadV1 test = new MaxMemUntypedBisLoadV1();
+    PerfUtil util = new PerfUtil();
+    
+    try
+    {
+    	System.gc();
+    	// infinite for loop - go until get oom
+    	for(int i=1; true; i++)
+    	{
+    		System.gc();
+    		byte[] bytes = util.createXmlDataBytes(flavor,Constants.MEM_INITIALSIZE+(interval*i));
+    		hash += test.run(new BufferedInputStream(new ByteArrayInputStream(bytes) ));
+    		size = bytes.length;
+    	}
+    }
+    catch (OutOfMemoryError oom)
+    {
+    	System.gc();
+    }
+    finally
+    {
+    	System.gc();
+        System.out.print(Constants.DELIM+MaxMemUntypedBisLoadV1.class.getName()+" flavor="+flavor+"
");
+        System.out.print("hash "+hash+" ");
+        System.out.print("memory "+memory+" ");
+        System.out.print("size="+size);
+    }
+  }
+
+  private int run(BufferedInputStream p_bis) throws Exception
+  {
+    // load the buffered input stream
+    XmlObject xobj = XmlObject.Factory.parse(p_bis);
+    return xobj.hashCode();
+  }
+}

Added: xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v2/MaxMemUntypedBisLoadV2.java
Url: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v2/MaxMemUntypedBisLoadV2.java?view=auto&rev=125551
==============================================================================
--- (empty file)
+++ xmlbeans/trunk/test/perf/src/org/apache/xmlbeans/test/performance/v2/MaxMemUntypedBisLoadV2.java
Tue Jan 18 13:50:50 2005
@@ -0,0 +1,76 @@
+/*   Copyright 2004 The Apache Software Foundation
+*
+*   Licensed under the Apache License, Version 2.0 (the "License");
+*   you may not use this file except in compliance with the License.
+*   You may obtain a copy of the License at
+*
+*       http://www.apache.org/licenses/LICENSE-2.0
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package org.apache.xmlbeans.test.performance.v2;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.test.performance.utils.Constants;
+import org.apache.xmlbeans.test.performance.utils.PerfUtil;
+
+
+public class MaxMemUntypedBisLoadV2
+{
+ 
+  public static void main(String[] args) throws Exception
+  {
+  	int interval = Constants.MEM_INTERVAL;
+  	long memory = Runtime.getRuntime().maxMemory();
+  	int size = 0;
+  	int hash = 0;
+    String flavor = null;
+
+    if(args.length == 0)
+      flavor = "deep-attributes";
+    else
+      flavor = args[0];
+
+    MaxMemUntypedBisLoadV2 test = new MaxMemUntypedBisLoadV2();
+    PerfUtil util = new PerfUtil();
+    
+    try
+    {
+    	System.gc();
+    	// infinite for loop - go until get oom
+    	for(int i=1; true; i++)
+    	{
+    		System.gc();
+    		byte[] bytes = util.createXmlDataBytes(flavor,Constants.MEM_INITIALSIZE+(interval*i));
+    		hash += test.run(new BufferedInputStream(new ByteArrayInputStream(bytes) ));
+    		size = bytes.length;
+    	}
+    }
+    catch (OutOfMemoryError oom)
+    {
+    	System.gc();
+    }
+    finally
+    {
+    	System.gc();
+        System.out.print(Constants.DELIM+MaxMemUntypedBisLoadV2.class.getName()+" flavor="+flavor+"
");
+        System.out.print("hash "+hash+" ");
+        System.out.print("memory "+memory+" ");
+        System.out.print("size="+size);
+    }
+  }
+
+  private int run(BufferedInputStream p_bis) throws Exception
+  {
+    // load the buffered input stream
+    XmlObject xobj = XmlObject.Factory.parse(p_bis);
+    return xobj.hashCode();
+  }
+}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org


Mime
View raw message