You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/09/05 09:43:59 UTC
svn commit: r1807328 - in /tomcat/trunk/java/org/apache/coyote/http2:
Http2Protocol.java Http2UpgradeHandler.java
Author: markt
Date: Tue Sep 5 09:43:59 2017
New Revision: 1807328
URL: http://svn.apache.org/viewvc?rev=1807328&view=rev
Log:
Refactor: Access concurrency control directly from protocol
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1807328&r1=1807327&r2=1807328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Tue Sep 5 09:43:59 2017
@@ -105,7 +105,6 @@ public class Http2Protocol implements Up
? new Http2AsyncUpgradeHandler(this, adapter, coyoteRequest)
: new Http2UpgradeHandler(this, adapter, coyoteRequest);
- result.setMaxConcurrentStreamExecution(getMaxConcurrentStreamExecution());
result.setAllowedTrailerHeaders(allowedTrailerHeaders);
result.setMaxHeaderCount(getMaxHeaderCount());
result.setMaxHeaderSize(getMaxHeaderSize());
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1807328&r1=1807327&r2=1807328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Sep 5 09:43:59 2017
@@ -135,7 +135,6 @@ class Http2UpgradeHandler extends Abstra
private long backLogSize = 0;
// Stream concurrency control
- private int maxConcurrentStreamExecution = Http2Protocol.DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION;
private AtomicInteger streamConcurrency = null;
private Queue<StreamRunnable> queuedRunnable = null;
@@ -190,7 +189,7 @@ class Http2UpgradeHandler extends Abstra
}
// Init concurrency control if needed
- if (maxConcurrentStreamExecution < localSettings.getMaxConcurrentStreams()) {
+ if (protocol.getMaxConcurrentStreamExecution() < localSettings.getMaxConcurrentStreams()) {
streamConcurrency = new AtomicInteger(0);
queuedRunnable = new ConcurrentLinkedQueue<>();
}
@@ -269,7 +268,7 @@ class Http2UpgradeHandler extends Abstra
if (streamConcurrency == null) {
socketWrapper.execute(streamRunnable);
} else {
- if (getStreamConcurrency() < maxConcurrentStreamExecution) {
+ if (getStreamConcurrency() < protocol.getMaxConcurrentStreamExecution()) {
increaseStreamConcurrency();
socketWrapper.execute(streamRunnable);
} else {
@@ -438,7 +437,7 @@ class Http2UpgradeHandler extends Abstra
return;
}
decreaseStreamConcurrency();
- if (getStreamConcurrency() < maxConcurrentStreamExecution) {
+ if (getStreamConcurrency() < protocol.getMaxConcurrentStreamExecution()) {
StreamRunnable streamRunnable = queuedRunnable.poll();
if (streamRunnable != null) {
increaseStreamConcurrency();
@@ -1128,11 +1127,6 @@ class Http2UpgradeHandler extends Abstra
// ------------------------------------------- Configuration getters/setters
- public void setMaxConcurrentStreamExecution(int maxConcurrentStreamExecution) {
- this.maxConcurrentStreamExecution = maxConcurrentStreamExecution;
- }
-
-
public void setAllowedTrailerHeaders(Set<String> allowedTrailerHeaders) {
this.allowedTrailerHeaders = allowedTrailerHeaders;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org