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

Split the generation of frames into 2: flow-controlled and 

non-flow-controlled.
This gives better code separation and proper removal of streams when
flow controlled frames complete.
This commit is contained in:
Simone Bordet 2014-06-13 16:28:54 +02:00
parent fb93973c9d
commit 388262227e
18 changed files with 140 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/FlowControlTest.java
View File

@ -44,6 +44,14 @@ import org.junit.Test;
public class FlowControlTest extends AbstractTest
{
@Override
public void dispose() throws Exception
{
// Allow WINDOW_UPDATE frames to be sent/received to avoid exception stack traces.
Thread.sleep(1000);
super.dispose();
}
@Test
public void testFlowControlWithConcurrentSettings() throws Exception
{

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2FlowControl.java
View File

@ -103,7 +103,7 @@ public class HTTP2FlowControl implements FlowControl
// Negative streamId allow for generation of bytes for both stream and session
int streamId = stream != null ? -stream.getId() : 0;
WindowUpdateFrame frame = new WindowUpdateFrame(streamId, length);
session.frame(stream, frame, Callback.Adapter.INSTANCE);
session.control(stream, frame, Callback.Adapter.INSTANCE);
}
@Override

155
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
View File

@ -117,14 +117,14 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
if (stream != null)
{
stream.updateClose(frame.isEndStream(), false);
flowControl.onDataReceived(this, stream, frame.getFlowControlledLength());
final int length = frame.remaining();
flowControl.onDataReceived(this, stream, length);
return stream.process(frame, new Callback.Adapter()
{
@Override
public void succeeded()
{
int consumed = frame.getFlowControlledLength();
flowControl.onDataConsumed(HTTP2Session.this, stream, consumed);
flowControl.onDataConsumed(HTTP2Session.this, stream, length);
}
});
}
@ -257,19 +257,19 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
@Override
public void settings(SettingsFrame frame, Callback callback)
{
frame(null, frame, callback);
control(null, frame, callback);
}
@Override
public void ping(PingFrame frame, Callback callback)
{
frame(null, frame, callback);
control(null, frame, callback);
}
@Override
public void reset(ResetFrame frame, Callback callback)
{
frame(null, frame, callback);
control(null, frame, callback);
}
@Override
@ -278,15 +278,27 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
byte[] payload = reason == null ? null : reason.getBytes(StandardCharsets.UTF_8);
GoAwayFrame frame = new GoAwayFrame(lastStreamId.get(), error, payload);
LOG.debug("Sending {}: {}", frame.getType(), reason);
frame(null, frame, callback);
control(null, frame, callback);
}
@Override
public void frame(IStream stream, Frame frame, Callback callback)
public void control(IStream stream, Frame frame, Callback callback)
{
// We want to generate as late as possible to allow re-prioritization.
FlusherEntry entry = new FlusherEntry(stream, frame, callback);
LOG.debug("Sending {}", frame);
frame(new FlusherEntry(stream, frame, callback));
}
@Override
public void data(IStream stream, DataFrame frame, Callback callback)
{
// We want to generate as late as possible to allow re-prioritization.
frame(new DataFlusherEntry(stream, frame, callback));
}
private void frame(FlusherEntry entry)
{
if (LOG.isDebugEnabled())
LOG.debug("Sending {}", entry.frame);
flusher.append(entry);
flusher.iterate();
}
@ -495,33 +507,38 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
{
FlusherEntry entry = queue.get(nonStalledIndex);
IStream stream = entry.stream;
int frameWindow = entry.frame.getFlowControlledLength();
if (frameWindow > 0)
int remaining = 0;
if (entry.frame instanceof DataFrame)
{
// Is the session stalled ?
if (sessionWindow <= 0)
DataFrame dataFrame = (DataFrame)entry.frame;
remaining = dataFrame.remaining();
if (remaining > 0)
{
flowControl.onSessionStalled(HTTP2Session.this);
++nonStalledIndex;
// There may be *non* flow controlled frames to send.
continue;
}
if (stream != null)
{
Integer streamWindow = streams.get(stream);
if (streamWindow == null)
// Is the session stalled ?
if (sessionWindow <= 0)
{
streamWindow = stream.getWindowSize();
streams.put(stream, streamWindow);
flowControl.onSessionStalled(HTTP2Session.this);
++nonStalledIndex;
// There may be *non* flow controlled frames to send.
continue;
}
// Is it a frame belonging to an already stalled stream ?
if (streamWindow <= 0)
if (stream != null)
{
flowControl.onStreamStalled(stream);
++nonStalledIndex;
continue;
Integer streamWindow = streams.get(stream);
if (streamWindow == null)
{
streamWindow = stream.getWindowSize();
streams.put(stream, streamWindow);
}
// Is it a frame belonging to an already stalled stream ?
if (streamWindow <= 0)
{
flowControl.onStreamStalled(stream);
++nonStalledIndex;
continue;
}
}
}
}
@ -531,16 +548,16 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
--size;
// If the stream has been reset, don't send flow controlled frames.
if (stream != null && stream.isReset() && frameWindow > 0)
if (stream != null && stream.isReset() && remaining > 0)
{
reset.add(entry);
continue;
}
// Reduce the flow control windows.
sessionWindow -= frameWindow;
if (stream != null && frameWindow > 0)
streams.put(stream, streams.get(stream) - frameWindow);
sessionWindow -= remaining;
if (stream != null && remaining > 0)
streams.put(stream, streams.get(stream) - remaining);
active.add(entry);
if (active.size() == maxGather)
@ -630,10 +647,9 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
private class FlusherEntry implements Callback
{
private final IStream stream;
private final Frame frame;
private final Callback callback;
private int length;
protected final IStream stream;
protected final Frame frame;
protected final Callback callback;
private FlusherEntry(IStream stream, Frame frame, Callback callback)
{
@ -646,13 +662,9 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
{
try
{
int windowSize = stream == null ? getWindowSize() : stream.getWindowSize();
int frameLength = frame.getFlowControlledLength();
if (frameLength > 0)
this.length = Math.min(frameLength, windowSize);
generator.generate(lease, frame, windowSize);
LOG.debug("Generated {}, windowSize={}", frame, windowSize);
generator.control(lease, frame);
if (LOG.isDebugEnabled())
LOG.debug("Generated {}", frame);
}
catch (Throwable x)
{
@ -661,12 +673,46 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
}
}
@Override
public void succeeded()
{
callback.succeeded();
}
@Override
public void failed(Throwable x)
{
callback.failed(x);
}
}
private class DataFlusherEntry extends FlusherEntry
{
private int length;
private DataFlusherEntry(IStream stream, DataFrame frame, Callback callback)
{
super(stream, frame, callback);
}
public void generate(ByteBufferPool.Lease lease)
{
DataFrame dataFrame = (DataFrame)frame;
int windowSize = stream.getWindowSize();
int frameLength = dataFrame.remaining();
this.length = Math.min(frameLength, windowSize);
generator.data(lease, dataFrame, length);
if (LOG.isDebugEnabled())
LOG.debug("Generated {}, maxLength={}", dataFrame, length);
}
@Override
public void succeeded()
{
flowControl.onDataSent(HTTP2Session.this, stream, length);
// Do we have more to send ?
if (frame.getFlowControlledLength() > 0)
DataFrame dataFrame = (DataFrame)frame;
if (dataFrame.remaining() > 0)
{
// We have written part of the frame, but there is more to write.
// We need to keep the correct ordering of frames, to avoid that other
@ -675,19 +721,14 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
}
else
{
// Only now we can update the close state
// and eventually remove the stream.
stream.updateClose(dataFrame.isEndStream(), true);
if (stream.isClosed())
removeStream(stream, true);
callback.succeeded();
// TODO: what below is needed ? YES IT IS.
// stream.updateCloseState(dataInfo.isClose(), true);
// if (stream.isClosed())
// removeStream(stream);
}
}
@Override
public void failed(Throwable x)
{
callback.failed(x);
}
}
private class PromiseCallback<C> implements Callback

4
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
View File

@ -63,13 +63,13 @@ public class HTTP2Stream implements IStream
@Override
public void headers(HeadersFrame frame, Callback callback)
{
session.frame(this, frame, callback);
session.control(this, frame, callback);
}
@Override
public void data(DataFrame frame, Callback callback)
{
session.frame(this, frame, callback);
session.data(this, frame, callback);
}
@Override

5
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/ISession.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.http2;
import org.eclipse.jetty.http2.api.Session;
import org.eclipse.jetty.http2.frames.DataFrame;
import org.eclipse.jetty.http2.frames.Frame;
import org.eclipse.jetty.util.Callback;
@ -27,7 +28,9 @@ public interface ISession extends Session
@Override
IStream getStream(int streamId);
public void frame(IStream stream, Frame frame, Callback callback);
public void control(IStream stream, Frame frame, Callback callback);
public void data(IStream stream, DataFrame frame, Callback callback);
public int updateWindowSize(int delta);
}

3
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/DataFrame.java
View File

@ -49,8 +49,7 @@ public class DataFrame extends Frame
return endStream;
}
@Override
public int getFlowControlledLength()
public int remaining()
{
return data.remaining();
}

5
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/Frame.java
View File

@ -35,11 +35,6 @@ public abstract class Frame
return type;
}
public int getFlowControlledLength()
{
return 0;
}
@Override
public String toString()
{

9
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/DataGenerator.java
View File

@ -27,14 +27,15 @@ import org.eclipse.jetty.http2.frames.FrameType;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.util.BufferUtil;
public class DataGenerator extends FrameGenerator
public class DataGenerator
{
private final HeaderGenerator headerGenerator;
public DataGenerator(HeaderGenerator headerGenerator)
{
super(headerGenerator);
this.headerGenerator = headerGenerator;
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
{
DataFrame dataFrame = (DataFrame)frame;
@ -82,7 +83,7 @@ public class DataGenerator extends FrameGenerator
if (last)
flags |= Flag.END_STREAM;
ByteBuffer header = generateHeader(lease, FrameType.DATA, length, flags, streamId);
ByteBuffer header = headerGenerator.generate(lease, FrameType.DATA, Frame.HEADER_LENGTH + length, length, flags, streamId);
BufferUtil.flipToFlush(header, 0);
lease.append(header, true);

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/FrameGenerator.java
View File

@ -33,7 +33,7 @@ public abstract class FrameGenerator
this.headerGenerator = headerGenerator;
}
public abstract void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength);
public abstract void generate(ByteBufferPool.Lease lease, Frame frame);
protected ByteBuffer generateHeader(ByteBufferPool.Lease lease, FrameType frameType, int length, int flags, int streamId)
{

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

@ -18,6 +18,7 @@
package org.eclipse.jetty.http2.generator;
import org.eclipse.jetty.http2.frames.DataFrame;
import org.eclipse.jetty.http2.frames.Frame;
import org.eclipse.jetty.http2.frames.FrameType;
import org.eclipse.jetty.http2.hpack.HpackEncoder;
@ -28,6 +29,7 @@ public class Generator
private final ByteBufferPool byteBufferPool;
private final int headerTableSize;
private final FrameGenerator[] generators;
private final DataGenerator dataGenerator;
public Generator(ByteBufferPool byteBufferPool)
{
@ -43,7 +45,6 @@ public class Generator
HpackEncoder encoder = new HpackEncoder(headerTableSize);
this.generators = new FrameGenerator[FrameType.values().length];
this.generators[FrameType.DATA.getType()] = new DataGenerator(headerGenerator);
this.generators[FrameType.HEADERS.getType()] = new HeadersGenerator(headerGenerator, encoder);
this.generators[FrameType.PRIORITY.getType()] = new PriorityGenerator(headerGenerator);
this.generators[FrameType.RST_STREAM.getType()] = new ResetGenerator(headerGenerator);
@ -56,6 +57,7 @@ public class Generator
this.generators[FrameType.ALTSVC.getType()] = null; // TODO
this.generators[FrameType.BLOCKED.getType()] = null; // TODO
this.dataGenerator = new DataGenerator(headerGenerator);
}
public ByteBufferPool getByteBufferPool()
@ -68,8 +70,13 @@ public class Generator
return headerTableSize;
}
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void control(ByteBufferPool.Lease lease, Frame frame)
{
generators[frame.getType().getType()].generate(lease, frame, maxLength);
generators[frame.getType().getType()].generate(lease, frame);
}
public void data(ByteBufferPool.Lease lease, DataFrame frame, int maxLength)
{
dataGenerator.generate(lease, frame, maxLength);
}
}

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/GoAwayGenerator.java
View File

@ -35,7 +35,7 @@ public class GoAwayGenerator extends FrameGenerator
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void generate(ByteBufferPool.Lease lease, Frame frame)
{
GoAwayFrame goAwayFrame = (GoAwayFrame)frame;
generateGoAway(lease, goAwayFrame.getLastStreamId(), goAwayFrame.getError(), goAwayFrame.getPayload());

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/HeadersGenerator.java
View File

@ -40,7 +40,7 @@ public class HeadersGenerator extends FrameGenerator
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void generate(ByteBufferPool.Lease lease, Frame frame)
{
HeadersFrame headersFrame = (HeadersFrame)frame;
generate(lease, headersFrame.getStreamId(), headersFrame.getMetaData(), !headersFrame.isEndStream());

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PingGenerator.java
View File

@ -35,7 +35,7 @@ public class PingGenerator extends FrameGenerator
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void generate(ByteBufferPool.Lease lease, Frame frame)
{
PingFrame pingFrame = (PingFrame)frame;
generatePing(lease, pingFrame.getPayload(), pingFrame.isReply());

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/PriorityGenerator.java
View File

@ -35,7 +35,7 @@ public class PriorityGenerator extends FrameGenerator
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void generate(ByteBufferPool.Lease lease, Frame frame)
{
PriorityFrame priorityFrame = (PriorityFrame)frame;
generatePriority(lease, priorityFrame.getStreamId(), priorityFrame.getDependentStreamId(), priorityFrame.getWeight(), priorityFrame.isExclusive());

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/ResetGenerator.java
View File

@ -35,7 +35,7 @@ public class ResetGenerator extends FrameGenerator
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void generate(ByteBufferPool.Lease lease, Frame frame)
{
ResetFrame resetFrame = (ResetFrame)frame;
generateReset(lease, resetFrame.getStreamId(), resetFrame.getError());

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/SettingsGenerator.java
View File

@ -36,7 +36,7 @@ public class SettingsGenerator extends FrameGenerator
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void generate(ByteBufferPool.Lease lease, Frame frame)
{
SettingsFrame settingsFrame = (SettingsFrame)frame;
generateSettings(lease, settingsFrame.getSettings(), settingsFrame.isReply());

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/generator/WindowUpdateGenerator.java
View File

@ -35,7 +35,7 @@ public class WindowUpdateGenerator extends FrameGenerator
}
@Override
public void generate(ByteBufferPool.Lease lease, Frame frame, int maxLength)
public void generate(ByteBufferPool.Lease lease, Frame frame)
{
WindowUpdateFrame windowUpdateFrame = (WindowUpdateFrame)frame;
generateWindowUpdate(lease, windowUpdateFrame.getStreamId(), windowUpdateFrame.getWindowDelta());

6
jetty-http2/http2-server/src/test/java/org/eclipse/jetty/http2/server/HTTP2ServerTest.java
View File

@ -105,7 +105,7 @@ public class HTTP2ServerTest
host + ":" + port, host, port, path, fields);
HeadersFrame request = new HeadersFrame(1, metaData, null, true);
ByteBufferPool.Lease lease = new ByteBufferPool.Lease(byteBufferPool);
generator.generate(lease, request, 0);
generator.control(lease, request);
// No preface bytes
@ -154,7 +154,7 @@ public class HTTP2ServerTest
host + ":" + port, host, port, path, fields);
HeadersFrame request = new HeadersFrame(1, metaData, null, true);
ByteBufferPool.Lease lease = new ByteBufferPool.Lease(byteBufferPool);
generator.generate(lease, request, 0);
generator.control(lease, request);
lease.prepend(ByteBuffer.wrap(PrefaceParser.PREFACE_BYTES), false);
try (Socket client = new Socket(host, port))
@ -217,7 +217,7 @@ public class HTTP2ServerTest
host + ":" + port, host, port, path, fields);
HeadersFrame request = new HeadersFrame(1, metaData, null, true);
ByteBufferPool.Lease lease = new ByteBufferPool.Lease(byteBufferPool);
generator.generate(lease, request, 0);
generator.control(lease, request);
lease.prepend(ByteBuffer.wrap(PrefaceParser.PREFACE_BYTES), false);
try (Socket client = new Socket(host, port))