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

Improved flow control logging.

This commit is contained in:
Simone Bordet 2014-06-13 15:22:03 +02:00
parent b30152df27
commit fb93973c9d
6 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,4 +35,8 @@ public interface FlowControl
public void onDataConsumed(ISession session, IStream stream, int length);
public void onDataSent(ISession session, IStream stream, int length);
public void onSessionStalled(ISession session);
public void onStreamStalled(IStream stream);
}

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

@ -26,7 +26,7 @@ import org.eclipse.jetty.util.log.Logger;
public class HTTP2FlowControl implements FlowControl
{
protected static final Logger LOG = Log.getLogger(HTTP2FlowControl.class);
private static final Logger LOG = Log.getLogger(HTTP2FlowControl.class);
private volatile int initialWindowSize;
@ -56,24 +56,33 @@ public class HTTP2FlowControl implements FlowControl
int delta = initialWindowSize - windowSize;
// Update the sessions's window size.
session.updateWindowSize(delta);
int oldSize = session.updateWindowSize(delta);
LOG.debug("Updated session initial window {} -> {} for {}", oldSize, oldSize + delta, session);
// Update the streams' window size.
for (Stream stream : session.getStreams())
((IStream)stream).updateWindowSize(delta);
{
oldSize = ((IStream)stream).updateWindowSize(delta);
LOG.debug("Updated stream initial window {} -> {} for {}", oldSize, oldSize + delta, stream);
}
}
@Override
public void onWindowUpdate(ISession session, IStream stream, WindowUpdateFrame frame)
{
int delta = frame.getWindowDelta();
if (frame.getStreamId() > 0)
{
if (stream != null)
stream.updateWindowSize(frame.getWindowDelta());
{
int oldSize = stream.updateWindowSize(delta);
LOG.debug("Updated stream window {} -> {} for {}", oldSize, oldSize + delta, stream);
}
}
else
{
session.updateWindowSize(frame.getWindowDelta());
int oldSize = session.updateWindowSize(frame.getWindowDelta());
LOG.debug("Updated session window {} -> {} for {}", oldSize, oldSize + delta, session);
}
}
@ -90,7 +99,7 @@ public class HTTP2FlowControl implements FlowControl
// We currently send a WindowUpdate every time, even if the frame was very small.
// Other policies may send the WindowUpdate only upon reaching a threshold.
LOG.debug("Consumed {} on {}", length, stream);
LOG.debug("Data consumed, increasing window by {} for {}", length, stream);
// 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);
@ -100,8 +109,28 @@ public class HTTP2FlowControl implements FlowControl
@Override
public void onDataSent(ISession session, IStream stream, int length)
{
session.updateWindowSize(length);
if (length == 0)
return;
LOG.debug("Data sent, decreasing window by {}", length);
int oldSize = session.updateWindowSize(-length);
LOG.debug("Updated session window {} -> {} for {}", oldSize, oldSize - length, session);
if (stream != null)
stream.updateWindowSize(length);
{
oldSize = stream.updateWindowSize(-length);
LOG.debug("Updated stream window {} -> {} for {}", oldSize, oldSize - length, stream);
}
}
@Override
public void onSessionStalled(ISession session)
{
LOG.debug("Session stalled {}", session);
}
@Override
public void onStreamStalled(IStream stream)
{
LOG.debug("Stream stalled {}", stream);
}
}

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

@ -386,13 +386,9 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
}
@Override
public void updateWindowSize(int delta)
public int updateWindowSize(int delta)
{
if (delta != 0)
{
int oldSize = windowSize.getAndAdd(delta);
HTTP2FlowControl.LOG.debug("Updated session window {} -> {} for {}", oldSize, oldSize + delta, this);
}
return windowSize.getAndAdd(delta);
}
private void updateLastStreamId(int streamId)
@ -505,7 +501,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
// Is the session stalled ?
if (sessionWindow <= 0)
{
HTTP2FlowControl.LOG.debug("Session stalled {}", HTTP2Session.this);
flowControl.onSessionStalled(HTTP2Session.this);
++nonStalledIndex;
// There may be *non* flow controlled frames to send.
continue;
@ -523,7 +519,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
// Is it a frame belonging to an already stalled stream ?
if (streamWindow <= 0)
{
HTTP2FlowControl.LOG.debug("Stream stalled {}", stream);
flowControl.onStreamStalled(stream);
++nonStalledIndex;
continue;
}
@ -668,7 +664,7 @@ public abstract class HTTP2Session implements ISession, Parser.Listener
@Override
public void succeeded()
{
flowControl.onDataSent(HTTP2Session.this, stream, -length);
flowControl.onDataSent(HTTP2Session.this, stream, length);
// Do we have more to send ?
if (frame.getFlowControlledLength() > 0)
{

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

@ -205,13 +205,9 @@ public class HTTP2Stream implements IStream
}
@Override
public void updateWindowSize(int delta)
public int updateWindowSize(int delta)
{
if (delta != 0)
{
int oldSize = windowSize.getAndAdd(delta);
HTTP2FlowControl.LOG.debug("Updated stream window {} -> {} for {}", oldSize, oldSize + delta, this);
}
return windowSize.getAndAdd(delta);
}
protected boolean notifyData(DataFrame frame, Callback callback)

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

@ -29,5 +29,5 @@ public interface ISession extends Session
public void frame(IStream stream, Frame frame, Callback callback);
public void updateWindowSize(int delta);
public int updateWindowSize(int delta);
}

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

@ -46,5 +46,5 @@ public interface IStream extends Stream
public int getWindowSize();
public void updateWindowSize(int delta);
public int updateWindowSize(int delta);
}