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

Fixed AsyncIO double dispatch

This commit is contained in:
Greg Wilkins 2015-02-19 18:13:31 +11:00
parent bb8b5f9b76
commit 968063c1ab
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpInputOverHTTP2.java
View File

@ -33,6 +33,6 @@ public class HttpInputOverHTTP2 extends HttpInput
@Override
protected void onReadPossible()
{
_httpChannelState.onReadPossible();
_httpChannelState.onReadPossible(true);
}
}

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

@ -60,6 +60,8 @@ public abstract class FillInterest
}
try
{
if (LOG.isDebugEnabled())
LOG.debug("{} register {}",this,callback);
needsFillInterest();
}
catch (Throwable e)
@ -78,7 +80,7 @@ public abstract class FillInterest
LOG.debug("{} fillable {}",this,callback);
if (callback != null && _interested.compareAndSet(callback, null))
callback.succeeded();
else
else if (LOG.isDebugEnabled())
LOG.debug("{} lost race {}",this,callback);
}

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -107,7 +107,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
@Override
protected void onReadPossible()
{
getState().onReadPossible();
getState().onReadPossible(true);
}
};
}

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

@ -716,7 +716,7 @@ public class HttpChannelState
_channel.getRequest().setAttribute(name,attribute);
}
public void onReadPossible()
public void onReadPossible(boolean execute)
{
boolean handle=false;
@ -730,7 +730,7 @@ public class HttpChannelState
}
}
if (handle)
if (execute && handle)
// TODO, do we need to execute or just run?
_channel.execute(_channel);
}

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java
View File

@ -51,6 +51,6 @@ public class HttpInputOverHTTP extends HttpInput
@Override
protected void onReadPossible()
{
_httpConnection.getHttpChannel().getState().onReadPossible();
_httpConnection.getHttpChannel().getState().onReadPossible(false); // Will be handled by async callback
}
}

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

@ -356,6 +356,8 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo
@Override
public void execute(Runnable job)
{
if (LOG.isDebugEnabled())
LOG.debug("queue {}",job);
if (!isRunning() || !_jobs.offer(job))
{
LOG.warn("{} rejected {}", this, job);
@ -552,7 +554,11 @@ public class QueuedThreadPool extends AbstractLifeCycle implements SizedThreadPo
// Job loop
while (job != null && isRunning())
{
if (LOG.isDebugEnabled())
LOG.debug("run {}",job);
runJob(job);
if (LOG.isDebugEnabled())
LOG.debug("ran {}",job);
if (Thread.interrupted())
{
ignore=true;