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

404517 Close connection if request received after half close

This commit is contained in:
Greg Wilkins 2013-04-04 15:36:37 +11:00
parent 3cd6d90e9f
commit df6e18cc00
1 changed files with 84 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
View File

@ -63,11 +63,13 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
*/ */
private volatile AsyncConnection _connection; private volatile AsyncConnection _connection;
/** true if a thread has been dispatched to handle this endpoint */ private static final int STATE_NEEDS_DISPATCH=-1;
private boolean _dispatched = false; private static final int STATE_UNDISPATCHED=0;
private static final int STATE_DISPATCHED=1;
private static final int STATE_ASYNC=2;
private int _state;
/** true if a non IO dispatch (eg async resume) is outstanding */ private boolean _onIdle;
private boolean _asyncDispatch = false;
/** true if the last write operation succeed and wrote all offered bytes */ /** true if the last write operation succeed and wrote all offered bytes */
private volatile boolean _writable = true; private volatile boolean _writable = true;
@ -83,6 +85,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
private boolean _open; private boolean _open;
private volatile long _idleTimestamp; private volatile long _idleTimestamp;
private volatile boolean _checkIdle;
private boolean _ishut; private boolean _ishut;
@ -94,8 +97,8 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
_manager = selectSet.getManager(); _manager = selectSet.getManager();
_selectSet = selectSet; _selectSet = selectSet;
_dispatched = false; _state=STATE_UNDISPATCHED;
_asyncDispatch = false; _onIdle=false;
_open=true; _open=true;
_key = key; _key = key;
@ -169,7 +172,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
// we are not interested in further selecting // we are not interested in further selecting
_key.interestOps(0); _key.interestOps(0);
if (!_dispatched) if (_state<STATE_DISPATCHED)
updateKey(); updateKey();
return; return;
} }
@ -184,13 +187,13 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
} }
// If dispatched, then deregister interest // If dispatched, then deregister interest
if (_dispatched) if (_state>=STATE_DISPATCHED)
_key.interestOps(0); _key.interestOps(0);
else else
{ {
// other wise do the dispatch // other wise do the dispatch
dispatch(); dispatch();
if (_dispatched && !_selectSet.getManager().isDeferringInterestedOps0()) if (_state>=STATE_DISPATCHED && !_selectSet.getManager().isDeferringInterestedOps0())
{ {
_key.interestOps(0); _key.interestOps(0);
} }
@ -203,10 +206,18 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
{ {
synchronized(this) synchronized(this)
{ {
if (_dispatched) switch(_state)
_asyncDispatch=true; {
else case STATE_NEEDS_DISPATCH:
dispatch(); case STATE_UNDISPATCHED:
dispatch();
break;
case STATE_DISPATCHED:
case STATE_ASYNC:
_state=STATE_ASYNC;
break;
}
} }
} }
@ -215,15 +226,20 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
{ {
synchronized(this) synchronized(this)
{ {
if (!_dispatched) if (_state<=STATE_UNDISPATCHED)
{ {
_dispatched = true; if (_onIdle)
boolean dispatched = _manager.dispatch(_handler); _state = STATE_NEEDS_DISPATCH;
if(!dispatched) else
{ {
_dispatched = false; _state = STATE_DISPATCHED;
LOG.warn("Dispatched Failed! "+this+" to "+_manager); boolean dispatched = _manager.dispatch(_handler);
updateKey(); if(!dispatched)
{
_state = STATE_UNDISPATCHED;
LOG.warn("Dispatched Failed! "+this+" to "+_manager);
updateKey();
}
} }
} }
} }
@ -240,15 +256,18 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
{ {
synchronized (this) synchronized (this)
{ {
if (_asyncDispatch) switch(_state)
{ {
_asyncDispatch=false; case STATE_ASYNC:
return false; _state=STATE_DISPATCHED;
return false;
default:
_state=STATE_UNDISPATCHED;
updateKey();
return true;
} }
_dispatched = false;
updateKey();
} }
return true;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -266,30 +285,33 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public void setCheckForIdle(boolean check) public void setCheckForIdle(boolean check)
{ {
_idleTimestamp=check?System.currentTimeMillis():0; if (check)
{
_idleTimestamp=System.currentTimeMillis();
_checkIdle=true;
}
else
_checkIdle=false;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public boolean isCheckForIdle() public boolean isCheckForIdle()
{ {
return _idleTimestamp!=0; return _checkIdle;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
protected void notIdle() protected void notIdle()
{ {
if (_idleTimestamp!=0) _idleTimestamp=System.currentTimeMillis();
_idleTimestamp=System.currentTimeMillis();
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public void checkIdleTimestamp(long now) public void checkIdleTimestamp(long now)
{ {
long idleTimestamp=_idleTimestamp; if (isCheckForIdle() && _maxIdleTime>0)
if (idleTimestamp!=0 && _maxIdleTime>0)
{ {
final long idleForMs=now-idleTimestamp; final long idleForMs=now-_idleTimestamp;
if (idleForMs>_maxIdleTime) if (idleForMs>_maxIdleTime)
{ {
@ -316,7 +338,27 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
public void onIdleExpired(long idleForMs) public void onIdleExpired(long idleForMs)
{ {
_connection.onIdleExpired(idleForMs); System.err.println("ON IDLE EXPIRED");
try
{
synchronized (this)
{
_onIdle=true;
}
if (_maxIdleTime>0 && (System.currentTimeMillis()-_idleTimestamp)>_maxIdleTime)
_connection.onIdleExpired(idleForMs);
}
finally
{
synchronized (this)
{
_onIdle=false;
if (_state==STATE_NEEDS_DISPATCH)
dispatch();
}
}
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -341,7 +383,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
synchronized (this) synchronized (this)
{ {
_writable=false; _writable=false;
if (!_dispatched) if (_state<STATE_DISPATCHED)
updateKey(); updateKey();
} }
} }
@ -367,7 +409,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
synchronized (this) synchronized (this)
{ {
_writable=false; _writable=false;
if (!_dispatched) if (_state<STATE_DISPATCHED)
updateKey(); updateKey();
} }
} }
@ -514,8 +556,8 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
int current_ops=-1; int current_ops=-1;
if (getChannel().isOpen()) if (getChannel().isOpen())
{ {
boolean read_interest = _readBlocked || (!_dispatched && !_connection.isSuspended()); boolean read_interest = _readBlocked || (_state<STATE_DISPATCHED && !_connection.isSuspended());
boolean write_interest= _writeBlocked || (!_dispatched && !_writable); boolean write_interest= _writeBlocked || (_state<STATE_DISPATCHED && !_writable);
_interestOps = _interestOps =
((!_socket.isInputShutdown() && read_interest ) ? SelectionKey.OP_READ : 0) ((!_socket.isInputShutdown() && read_interest ) ? SelectionKey.OP_READ : 0)
@ -764,11 +806,11 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPo
{ {
keyString += "-"; keyString += "-";
} }
return String.format("SCEP@%x{l(%s)<->r(%s),d=%b,open=%b,ishut=%b,oshut=%b,rb=%b,wb=%b,w=%b,i=%d%s}-{%s}", return String.format("SCEP@%x{l(%s)<->r(%s),s=%d,open=%b,ishut=%b,oshut=%b,rb=%b,wb=%b,w=%b,i=%d%s}-{%s}",
hashCode(), hashCode(),
_socket.getRemoteSocketAddress(), _socket.getRemoteSocketAddress(),
_socket.getLocalSocketAddress(), _socket.getLocalSocketAddress(),
_dispatched, _state,
isOpen(), isOpen(),
isInputShutdown(), isInputShutdown(),
isOutputShutdown(), isOutputShutdown(),