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

Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

This commit is contained in:
Joakim Erdfelt 2014-04-30 09:01:35 -07:00
parent d8c8db5b83 d17547cf96
commit 40c352b25c
2 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-client/src/main/java/org/eclipse/jetty/client/util/BufferingResponseListener.java
View File

@ -103,10 +103,10 @@ public abstract class BufferingResponseListener extends Listener.Adapter
int length = content.remaining();
if (length>BufferUtil.space(buffer))
{
int requiredCapacity = buffer.capacity()+length;
int requiredCapacity = buffer==null?0:buffer.capacity()+length;
if (requiredCapacity>maxLength)
response.abort(new IllegalArgumentException("Buffering capacity exceeded"));
int newCapacity = Math.min(Integer.highestOneBit(requiredCapacity) << 1, maxLength);
buffer = BufferUtil.ensureCapacity(buffer,newCapacity);
}

89
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
View File

@ -35,21 +35,6 @@ import org.eclipse.jetty.util.thread.Scheduler;
/**
* Implementation of AsyncContext interface that holds the state of request-response cycle.
*
* <table>
* <tr><th>STATE</th><th colspan=6>ACTION</th></tr>
* <tr><th></th> <th>handling()</th> <th>startAsync()</th><th>unhandle()</th> <th>dispatch()</th> <th>complete()</th> <th>completed()</th></tr>
* <tr><th align=right>IDLE:</th> <td>DISPATCHED</td> <td></td> <td></td> <td></td> <td>COMPLETECALLED??</td><td></td></tr>
* <tr><th align=right>DISPATCHED:</th> <td></td> <td>ASYNCSTARTED</td><td>COMPLETING</td> <td></td> <td></td> <td></td></tr>
* <tr><th align=right>ASYNCSTARTED:</th> <td></td> <td></td> <td>ASYNCWAIT</td> <td>REDISPATCHING</td><td>COMPLETECALLED</td> <td></td></tr>
* <tr><th align=right>REDISPATCHING:</th> <td></td> <td></td> <td>REDISPATCHED</td><td></td> <td></td> <td></td></tr>
* <tr><th align=right>ASYNCWAIT:</th> <td></td> <td></td> <td></td> <td>REDISPATCH</td> <td>COMPLETECALLED</td> <td></td></tr>
* <tr><th align=right>REDISPATCH:</th> <td>REDISPATCHED</td><td></td> <td></td> <td></td> <td></td> <td></td></tr>
* <tr><th align=right>REDISPATCHED:</th> <td></td> <td>ASYNCSTARTED</td><td>COMPLETING</td> <td></td> <td></td> <td></td></tr>
* <tr><th align=right>COMPLETECALLED:</th><td>COMPLETING</td> <td></td> <td>COMPLETING</td> <td></td> <td></td> <td></td></tr>
* <tr><th align=right>COMPLETING:</th> <td>COMPLETING</td> <td></td> <td></td> <td></td> <td></td> <td>COMPLETED</td></tr>
* <tr><th align=right>COMPLETED:</th> <td></td> <td></td> <td></td> <td></td> <td></td> <td></td></tr>
* </table>
*/
public class HttpChannelState
{
@ -57,16 +42,22 @@ public class HttpChannelState
private final static long DEFAULT_TIMEOUT=30000L;
/** The dispatched state of the HttpChannel, used to control the overall livecycle
*/
public enum State
{
IDLE, // Idle request
DISPATCHED, // Request dispatched to filter/servlet
ASYNCWAIT, // Suspended and parked
ASYNCIO, // Has been dispatched for async IO
COMPLETING, // Request is completable
COMPLETED // Request is complete
IDLE, // Idle request
DISPATCHED, // Request dispatched to filter/servlet
ASYNC_WAIT, // Suspended and parked
ASYNC_WOKEN, // A thread has been dispatch to handle from ASYNCWAIT
ASYNC_IO, // Has been dispatched for async IO
COMPLETING, // Request is completable
COMPLETED // Request is complete
}
/**
* The actions to take as the channel moves from state to state.
*/
public enum Action
{
REQUEST_DISPATCH, // handle a normal request dispatch
@ -78,6 +69,11 @@ public class HttpChannelState
COMPLETE // Complete the channel
}
/**
* The state of the servlet async API. This can lead or follow the
* channel dispatch state and also includes reasons such as expired,
* dispatched or completed.
*/
public enum Async
{
STARTED,
@ -188,16 +184,18 @@ public class HttpChannelState
case COMPLETED:
return Action.WAIT;
case ASYNCWAIT:
case ASYNC_WAIT:
LOG.warn("How did I get here?", new Throwable());
case ASYNC_WOKEN:
if (_asyncRead)
{
_state=State.ASYNCIO;
_state=State.ASYNC_IO;
_asyncRead=false;
return Action.READ_CALLBACK;
}
if (_asyncWrite)
{
_state=State.ASYNCIO;
_state=State.ASYNC_IO;
_asyncWrite=false;
return Action.WRITE_CALLBACK;
}
@ -293,7 +291,7 @@ public class HttpChannelState
switch(_state)
{
case DISPATCHED:
case ASYNCIO:
case ASYNC_IO:
break;
default:
throw new IllegalStateException(this.getStatusString());
@ -301,7 +299,7 @@ public class HttpChannelState
if (_asyncRead)
{
_state=State.ASYNCIO;
_state=State.ASYNC_IO;
_asyncRead=false;
return Action.READ_CALLBACK;
}
@ -309,7 +307,7 @@ public class HttpChannelState
if (_asyncWrite)
{
_asyncWrite=false;
_state=State.ASYNCIO;
_state=State.ASYNC_IO;
return Action.WRITE_CALLBACK;
}
@ -333,7 +331,7 @@ public class HttpChannelState
case EXPIRING:
case STARTED:
scheduleTimeout();
_state=State.ASYNCWAIT;
_state=State.ASYNC_WAIT;
return Action.WAIT;
}
}
@ -360,7 +358,7 @@ public class HttpChannelState
switch(_state)
{
case DISPATCHED:
case ASYNCIO:
case ASYNC_IO:
dispatch=false;
break;
default:
@ -411,8 +409,11 @@ public class HttpChannelState
if (_async==Async.EXPIRING)
{
_async=Async.EXPIRED;
if (_state==State.ASYNCWAIT)
if (_state==State.ASYNC_WAIT)
{
_state=State.ASYNC_WOKEN;
dispatch=true;
}
}
}
@ -423,13 +424,17 @@ public class HttpChannelState
public void complete()
{
// just like resume, except don't set _dispatched=true;
boolean handle;
boolean handle=false;
synchronized (this)
{
if (_async!=Async.STARTED && _async!=Async.EXPIRING)
throw new IllegalStateException(this.getStatusString());
_async=Async.COMPLETE;
handle=_state==State.ASYNCWAIT;
if (_state==State.ASYNC_WAIT)
{
handle=true;
_state=State.ASYNC_WOKEN;
}
}
cancelTimeout();
@ -511,7 +516,7 @@ public class HttpChannelState
switch(_state)
{
case DISPATCHED:
case ASYNCIO:
case ASYNC_IO:
throw new IllegalStateException(getStatusString());
default:
break;
@ -571,7 +576,7 @@ public class HttpChannelState
{
synchronized(this)
{
return _state==State.ASYNCWAIT || _state==State.DISPATCHED && _async==Async.STARTED;
return _state==State.ASYNC_WAIT || _state==State.DISPATCHED && _async==Async.STARTED;
}
}
@ -665,12 +670,16 @@ public class HttpChannelState
public void onReadPossible()
{
boolean handle;
boolean handle=false;
synchronized (this)
{
_asyncRead=true;
handle=_state==State.ASYNCWAIT;
if (_state==State.ASYNC_WAIT)
{
_state=State.ASYNC_WOKEN;
handle=true;
}
}
if (handle)
@ -679,12 +688,16 @@ public class HttpChannelState
public void onWritePossible()
{
boolean handle;
boolean handle=false;
synchronized (this)
{
_asyncWrite=true;
handle=_state==State.ASYNCWAIT;
if (_state==State.ASYNC_WAIT)
{
_state=State.ASYNC_WOKEN;
handle=true;
}
}
if (handle)