You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/10/20 09:54:30 UTC
svn commit: r1186650 - in /maven/sandbox/trunk/wagon/wagon-benchmarks: ./
wagon-benchmarks-ahc/
wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/
wagon-benchmarks-http-lightweight/ wagon-benchmarks-http/
Author: olamy
Date: Thu Oct 20 07:54:30 2011
New Revision: 1186650
URL: http://svn.apache.org/viewvc?rev=1186650&view=rev
Log:
use more human readable system props
Modified:
maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/pom.xml
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/pom.xml
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/pom.xml
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml?rev=1186650&r1=1186649&r2=1186650&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml Thu Oct 20 07:54:30 2011
@@ -38,8 +38,10 @@ under the License.
<jettyVersion>7.4.5.v20110725</jettyVersion>
<sisuInjectVersion>2.3.0</sisuInjectVersion>
<slf4jVersion>1.6.1</slf4jVersion>
- <getRequestNumber>1000</getRequestNumber>
- <getRequestThreadNumber>8</getRequestThreadNumber>
+ <!-- total number of http request -->
+ <wagon.benchmark.rq.number>1000</wagon.benchmark.rq.number>
+ <!-- parallel request to do -->
+ <wagon.benchmark.rq.parallel>8</wagon.benchmark.rq.parallel>
<surefireForkedVmArgs>-Xmx512m -Xms512m -client</surefireForkedVmArgs>
</properties>
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/pom.xml?rev=1186650&r1=1186649&r2=1186650&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/pom.xml (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/pom.xml Thu Oct 20 07:54:30 2011
@@ -59,9 +59,8 @@ under the License.
<argLine>${surefireForkedVmArgs}</argLine>
<systemPropertyVariables>
<test.keystore.path>${basedir}/src/test/ssl/keystore</test.keystore.path>
- <getRequestNumber>${getRequestNumber}</getRequestNumber>
- <getRequestNumber>${getRequestNumber}</getRequestNumber>
- <getRequestThreadNumber>${getRequestThreadNumber}</getRequestThreadNumber>
+ <wagon.benchmark.rq.number>${wagon.benchmark.rq.number}</wagon.benchmark.rq.number>
+ <wagon.benchmark.rq.parallel>${wagon.benchmark.rq.parallel}</wagon.benchmark.rq.parallel>
</systemPropertyVariables>
</configuration>
</plugin>
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java?rev=1186650&r1=1186649&r2=1186650&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java Thu Oct 20 07:54:30 2011
@@ -41,6 +41,10 @@ public abstract class AbstractWagonHttpC
extends AbstractWagonClientTest
{
+ static int parallelRequestNumber = Integer.parseInt( System.getProperty( "wagon.benchmark.rq.parallel" ) );
+
+ static int requestNumber = Integer.parseInt( System.getProperty( "wagon.benchmark.rq.number" ) );
+
@Test
public void getSmallFilesHttpNotCompressed()
throws Exception
@@ -104,8 +108,7 @@ public abstract class AbstractWagonHttpC
testServer.start();
- call( Integer.parseInt( System.getProperty( "getRequestThreadNumber" ) ),
- Integer.parseInt( System.getProperty( "getRequestNumber" ) ), ssl, testServer.port, true );
+ call( ssl, testServer.port, true );
testServer.stop();
@@ -179,8 +182,7 @@ public abstract class AbstractWagonHttpC
testServer.start();
- call( Integer.parseInt( System.getProperty( "getRequestThreadNumber" ) ),
- Integer.parseInt( System.getProperty( "getRequestNumber" ) ), ssl, testServer.port, false );
+ call( ssl, testServer.port, false );
testServer.stop();
@@ -188,7 +190,7 @@ public abstract class AbstractWagonHttpC
}
- protected void call( int poolNumber, int requestNumber, boolean ssl, final int port, final boolean testcontent )
+ protected void call( boolean ssl, final int port, final boolean testcontent )
throws Exception
{
List<Callable<Void>> callables = new ArrayList<Callable<Void>>();
@@ -223,7 +225,7 @@ public abstract class AbstractWagonHttpC
}
- ExecutorService executorService = Executors.newFixedThreadPool( 15 );
+ ExecutorService executorService = Executors.newFixedThreadPool( parallelRequestNumber );
executorService.invokeAll( callables );
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/pom.xml?rev=1186650&r1=1186649&r2=1186650&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/pom.xml (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/pom.xml Thu Oct 20 07:54:30 2011
@@ -54,8 +54,8 @@ under the License.
<argLine>${surefireForkedVmArgs}</argLine>
<systemPropertyVariables>
<test.keystore.path>${basedir}/src/test/ssl/keystore</test.keystore.path>
- <getRequestNumber>${getRequestNumber}</getRequestNumber>
- <getRequestThreadNumber>${getRequestThreadNumber}</getRequestThreadNumber>
+ <wagon.benchmark.rq.number>${wagon.benchmark.rq.number}</wagon.benchmark.rq.number>
+ <wagon.benchmark.rq.parallel>${wagon.benchmark.rq.parallel}</wagon.benchmark.rq.parallel>
</systemPropertyVariables>
</configuration>
</plugin>
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/pom.xml?rev=1186650&r1=1186649&r2=1186650&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/pom.xml (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/pom.xml Thu Oct 20 07:54:30 2011
@@ -54,9 +54,8 @@ under the License.
<argLine>${surefireForkedVmArgs}</argLine>
<systemPropertyVariables>
<test.keystore.path>${basedir}/src/test/ssl/keystore</test.keystore.path>
- <getRequestNumber>${getRequestNumber}</getRequestNumber>
- <getRequestNumber>${getRequestNumber}</getRequestNumber>
- <getRequestThreadNumber>${getRequestThreadNumber}</getRequestThreadNumber>
+ <wagon.benchmark.rq.number>${wagon.benchmark.rq.number}</wagon.benchmark.rq.number>
+ <wagon.benchmark.rq.parallel>${wagon.benchmark.rq.parallel}</wagon.benchmark.rq.parallel>
</systemPropertyVariables>
</configuration>
</plugin>