Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-9.3.x' into 'master'.

This commit is contained in:
Simone Bordet 2015-12-24 12:37:05 +01:00
parent c66a4d5aa7 997b868ecd
commit 7b713507c6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/BufferingFlowControlStrategy.java
View File

@ -57,7 +57,7 @@ public class BufferingFlowControlStrategy extends AbstractFlowControlStrategy
private final AtomicInteger maxSessionRecvWindow = new AtomicInteger(DEFAULT_WINDOW_SIZE);
private final AtomicInteger sessionLevel = new AtomicInteger();
private final Map<IStream, AtomicInteger> streamLevels = new ConcurrentHashMap<>();
private final float bufferRatio;
private float bufferRatio;
public BufferingFlowControlStrategy(float bufferRatio)
{
@ -76,6 +76,11 @@ public class BufferingFlowControlStrategy extends AbstractFlowControlStrategy
return bufferRatio;
}
public void setBufferRatio(float bufferRatio)
{
this.bufferRatio = bufferRatio;
}
@Override
public void onStreamCreated(IStream stream)
{
@ -96,9 +101,11 @@ public class BufferingFlowControlStrategy extends AbstractFlowControlStrategy
if (length <= 0)
return;
float ratio = bufferRatio;
WindowUpdateFrame windowFrame = null;
int level = sessionLevel.addAndGet(length);
int maxLevel = (int)(maxSessionRecvWindow.get() * bufferRatio);
int maxLevel = (int)(maxSessionRecvWindow.get() * ratio);
if (level > maxLevel)
{
level = sessionLevel.getAndSet(0);
@ -127,7 +134,7 @@ public class BufferingFlowControlStrategy extends AbstractFlowControlStrategy
if (streamLevel != null)
{
level = streamLevel.addAndGet(length);
maxLevel = (int)(getInitialStreamRecvWindow() * bufferRatio);
maxLevel = (int)(getInitialStreamRecvWindow() * ratio);
if (level > maxLevel)
{
level = streamLevel.getAndSet(0);