You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/12/27 16:23:46 UTC
svn commit: r1426223 - in /httpcomponents/benchmark/httpclient/trunk: ./
src/main/java/org/apache/http/client/benchmark/
Author: olegk
Date: Thu Dec 27 15:23:46 2012
New Revision: 1426223
URL: http://svn.apache.org/viewvc?rev=1426223&view=rev
Log:
Use standard (default) Jetty connector configuration; removed HttpClient 3.x and HttpCore 4.x agents; upgraded HttpClient to 4.2.2
Removed:
httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/TestHttpClient3.java
httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/TestHttpCore.java
Modified:
httpcomponents/benchmark/httpclient/trunk/pom.xml
httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/Benchmark.java
httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/TestNingHttpClient.java
Modified: httpcomponents/benchmark/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpclient/trunk/pom.xml?rev=1426223&r1=1426222&r2=1426223&view=diff
==============================================================================
--- httpcomponents/benchmark/httpclient/trunk/pom.xml (original)
+++ httpcomponents/benchmark/httpclient/trunk/pom.xml Thu Dec 27 15:23:46 2012
@@ -53,13 +53,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <version>4.2.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -97,8 +91,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
<maven.compile.optimize>true</maven.compile.optimize>
<maven.compile.deprecation>true</maven.compile.deprecation>
</properties>
Modified: httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/Benchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/Benchmark.java?rev=1426223&r1=1426222&r2=1426223&view=diff
==============================================================================
--- httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/Benchmark.java (original)
+++ httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/Benchmark.java Thu Dec 27 15:23:46 2012
@@ -38,11 +38,10 @@ import javax.servlet.http.HttpServletRes
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.util.ByteArrayOutputStream2;
import org.eclipse.jetty.util.IO;
-import org.eclipse.jetty.util.thread.QueuedThreadPool;
public class Benchmark {
@@ -56,29 +55,16 @@ public class Benchmark {
int c = Integer.parseInt(nc);
int contentLen = Integer.parseInt(cls);
- SocketConnector connector = new SocketConnector();
- connector.setPort(0);
- connector.setRequestBufferSize(12 * 1024);
- connector.setResponseBufferSize(12 * 1024);
- connector.setAcceptors(2);
- connector.setAcceptQueueSize(c);
-
- QueuedThreadPool threadpool = new QueuedThreadPool();
- threadpool.setMinThreads(c);
- threadpool.setMaxThreads(2000);
-
+ SelectChannelConnector connector = new SelectChannelConnector();
Server server = new Server();
server.addConnector(connector);
- server.setThreadPool(threadpool);
server.setHandler(new RandomDataHandler());
server.start();
int port = connector.getLocalPort();
TestHttpAgent[] agents = new TestHttpAgent[] {
- new TestHttpClient3(),
new TestHttpJRE(),
- new TestHttpCore(),
new TestHttpClient4(),
new TestJettyHttpClient(),
new TestNingHttpClient()
Modified: httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/TestNingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/TestNingHttpClient.java?rev=1426223&r1=1426222&r2=1426223&view=diff
==============================================================================
--- httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/TestNingHttpClient.java (original)
+++ httpcomponents/benchmark/httpclient/trunk/src/main/java/org/apache/http/client/benchmark/TestNingHttpClient.java Thu Dec 27 15:23:46 2012
@@ -94,7 +94,7 @@ public class TestNingHttpClient implemen
}
public String getClientName() {
- return "Ning async HTTP client 1.6.4";
+ return "Ning async HTTP client 1.7.4";
}
static class SimpleAsyncHandler implements AsyncHandler<Object> {