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

410559 Removed FillInterest race

This commit is contained in:
Greg Wilkins 2013-06-12 18:35:13 +10:00
parent c5bf9c3d49
commit 955e7e8d74
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
View File

@ -22,6 +22,7 @@ import java.io.IOException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.ReadPendingException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jetty.util.Callback;
@ -34,8 +35,7 @@ import org.eclipse.jetty.util.Callback;
*/
public abstract class FillInterest
{
private final AtomicBoolean _interested = new AtomicBoolean(false);
private volatile Callback _callback;
private final AtomicReference<Callback> _interested = new AtomicReference<>(null);
/* ------------------------------------------------------------ */
protected FillInterest()
@ -52,9 +52,11 @@ public abstract class FillInterest
*/
public <C> void register(Callback callback) throws ReadPendingException
{
if (!_interested.compareAndSet(false,true))
if (callback==null)
throw new IllegalArgumentException();
if (!_interested.compareAndSet(null,callback))
throw new ReadPendingException();
_callback=callback;
try
{
if (needsFill())
@ -71,12 +73,9 @@ public abstract class FillInterest
*/
public void fillable()
{
if (_interested.compareAndSet(true,false))
{
Callback callback=_callback;
_callback=null;
Callback callback=_interested.get();
if (callback!=null && _interested.compareAndSet(callback,null))
callback.succeeded();
}
}
/* ------------------------------------------------------------ */
@ -85,7 +84,7 @@ public abstract class FillInterest
*/
public boolean isInterested()
{
return _interested.get();
return _interested.get()!=null;
}
/* ------------------------------------------------------------ */
@ -93,30 +92,24 @@ public abstract class FillInterest
*/
public void onFail(Throwable cause)
{
if (_interested.compareAndSet(true,false))
{
Callback callback=_callback;
_callback=null;
Callback callback=_interested.get();
if (callback!=null && _interested.compareAndSet(callback,null))
callback.failed(cause);
}
}
/* ------------------------------------------------------------ */
public void onClose()
{
if (_interested.compareAndSet(true,false))
{
Callback callback=_callback;
_callback=null;
Callback callback=_interested.get();
if (callback!=null && _interested.compareAndSet(callback,null))
callback.failed(new ClosedChannelException());
}
}
/* ------------------------------------------------------------ */
@Override
public String toString()
{
return String.format("FillInterest@%x{%b,%s}",hashCode(),_interested.get(),_callback);
return String.format("FillInterest@%x{%b,%s}",hashCode(),_interested.get(),_interested.get());
}
/* ------------------------------------------------------------ */

11
jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
View File

@ -157,9 +157,9 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo
int size = _threads.size();
if (size > 0)
{
LOG.warn("{} threads could not be stopped", size);
if ((size <= Runtime.getRuntime().availableProcessors()) || LOG.isDebugEnabled())
Thread.yield();
if (LOG.isDebugEnabled())
{
for (Thread unstopped : _threads)
{
@ -171,6 +171,11 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo
LOG.warn("Couldn't stop {}{}", unstopped, dmp.toString());
}
}
else
{
for (Thread unstopped : _threads)
LOG.warn("{} Couldn't stop {}",this,unstopped);
}
}
synchronized (_joinLock)