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

Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.

This commit is contained in:
Simone Bordet 2016-06-13 12:16:33 +02:00
parent e93f98951b e803bf6c81
commit 3d8242ef82
6 changed files with 270 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneHandler.java
View File

@ -18,7 +18,6 @@
package org.eclipse.jetty.embedded;
import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
@ -27,7 +26,6 @@ public class OneHandler
public static void main( String[] args ) throws Exception
{
Server server = new Server(8080);
server.getConnectors()[0].getConnectionFactory(HttpConnectionFactory.class).setHttpCompliance(HttpCompliance.LEGACY);
server.setHandler(new HelloHandler());
server.start();

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

@ -265,6 +265,31 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
{
handle();
}
// TODO Revert once #624 debugged
private static ThreadLocal<Throwable> __dispatchedFrom=new ThreadLocal<>();
public static Throwable getDispatchedFrom() { return __dispatchedFrom.get(); }
public Runnable getRunnable()
{
Throwable _dispatched = new Throwable();
return new Runnable()
{
@Override
public void run()
{
try
{
__dispatchedFrom.set(_dispatched);
handle();
}
finally
{
__dispatchedFrom.set(null);
}
}
};
}
AtomicReference<Action> caller = new AtomicReference<>();

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

@ -615,7 +615,7 @@ public class HttpChannelState
cancelTimeout(event);
if (handle)
runInContext(event,_channel);
runInContext(event,_channel.getRunnable());
}
public void errorComplete()
@ -887,7 +887,7 @@ public class HttpChannelState
protected void scheduleDispatch()
{
_channel.execute(_channel);
_channel.execute(_channel.getRunnable());
}
protected void scheduleTimeout(AsyncContextEvent event)

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

@ -122,7 +122,7 @@ public class HttpInput extends ServletInputStream implements Runnable
{
HttpChannel channel = _channelState.getHttpChannel();
Executor executor = channel.getConnector().getServer().getThreadPool();
executor.execute(channel);
executor.execute(channel.getRunnable());
}

6
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
View File

@ -860,7 +860,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
{
_writeListener = writeListener;
if (_channel.getState().onWritePossible())
_channel.execute(_channel);
_channel.execute(_channel.getRunnable());
}
else
throw new IllegalStateException();
@ -1005,7 +1005,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
if (!_state.compareAndSet(OutputState.UNREADY, OutputState.READY))
continue;
if (_channel.getState().onWritePossible())
_channel.execute(_channel);
_channel.execute(_channel.getRunnable());
break;
case CLOSED:
@ -1023,7 +1023,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable
{
_onError=e==null?new IOException():e;
if (_channel.getState().onWritePossible())
_channel.execute(_channel);
_channel.execute(_channel.getRunnable());
}
}

509
jetty-server/src/test/java/org/eclipse/jetty/server/LocalAsyncContextTest.java
View File

@ -18,12 +18,9 @@
package org.eclipse.jetty.server;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.io.InputStream;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
@ -37,6 +34,7 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.util.thread.Locker;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Assert;
@ -45,6 +43,10 @@ import org.junit.Test;
public class LocalAsyncContextTest
{
private final Locker _completeLock = new Locker();
private Throwable __completed;
private Throwable __dispatched;
private final AtomicReference<Throwable> __completed1 = new AtomicReference<>();
protected Server _server;
protected SuspendHandler _handler;
protected Connector _connector;
@ -54,7 +56,7 @@ public class LocalAsyncContextTest
{
_server = new Server();
_connector = initConnector();
_server.setConnectors(new Connector[]{ _connector });
_server.addConnector(_connector);
SessionHandler session = new SessionHandler();
_handler = new SuspendHandler();
@ -63,7 +65,10 @@ public class LocalAsyncContextTest
_server.setHandler(session);
_server.start();
__completed.set(null);
try (Locker.Lock lock = _completeLock.lock())
{
__completed = null;
}
__completed1.set(null);
}
@ -87,10 +92,17 @@ public class LocalAsyncContextTest
_handler.setSuspendFor(1000);
_handler.setResumeAfter(-1);
_handler.setCompleteAfter(-1);
response=process(null);
check(response,"TIMEOUT");
spinAssertEquals(1,()->{return __completed.get()==null?0:1;});
spinAssertEquals(1,()->{return __completed1.get()==null?0:1;});
response = process(null);
check(response, "TIMEOUT");
spinAssertEquals(1, () ->
{
try (Locker.Lock lock = _completeLock.lock())
{
return __completed == null ? 0 : 1;
}
});
spinAssertEquals(1, () -> __completed1.get() == null ? 0 : 1);
}
@Test
@ -101,8 +113,8 @@ public class LocalAsyncContextTest
_handler.setSuspendFor(10000);
_handler.setResumeAfter(0);
_handler.setCompleteAfter(-1);
response=process(null);
check(response,"STARTASYNC","DISPATCHED");
response = process(null);
check(response, "STARTASYNC", "DISPATCHED");
}
@Test
@ -113,8 +125,8 @@ public class LocalAsyncContextTest
_handler.setSuspendFor(10000);
_handler.setResumeAfter(100);
_handler.setCompleteAfter(-1);
response=process(null);
check(response,"STARTASYNC","DISPATCHED");
response = process(null);
check(response, "STARTASYNC", "DISPATCHED");
}
@Test
@ -125,8 +137,8 @@ public class LocalAsyncContextTest
_handler.setSuspendFor(10000);
_handler.setResumeAfter(-1);
_handler.setCompleteAfter(0);
response=process(null);
check(response,"STARTASYNC","COMPLETED");
response = process(null);
check(response, "STARTASYNC", "COMPLETED");
}
@Test
@ -137,9 +149,8 @@ public class LocalAsyncContextTest
_handler.setSuspendFor(10000);
_handler.setResumeAfter(-1);
_handler.setCompleteAfter(200);
response=process(null);
check(response,"STARTASYNC","COMPLETED");
response = process(null);
check(response, "STARTASYNC", "COMPLETED");
}
@Test
@ -150,8 +161,8 @@ public class LocalAsyncContextTest
_handler.setRead(-1);
_handler.setResumeAfter(0);
_handler.setCompleteAfter(-1);
response=process("wibble");
check(response,"STARTASYNC","DISPATCHED");
response = process("wibble");
check(response, "STARTASYNC", "DISPATCHED");
}
@Test
@ -162,9 +173,8 @@ public class LocalAsyncContextTest
_handler.setRead(-1);
_handler.setResumeAfter(100);
_handler.setCompleteAfter(-1);
response=process("wibble");
check(response,"DISPATCHED");
response = process("wibble");
check(response, "DISPATCHED");
}
@Test
@ -175,35 +185,35 @@ public class LocalAsyncContextTest
_handler.setRead(-1);
_handler.setResumeAfter(-1);
_handler.setCompleteAfter(0);
response=process("wibble");
check(response,"COMPLETED");
response = process("wibble");
check(response, "COMPLETED");
_handler.setResumeAfter(-1);
_handler.setCompleteAfter(100);
response=process("wibble");
check(response,"COMPLETED");
response = process("wibble");
check(response, "COMPLETED");
_handler.setRead(6);
_handler.setResumeAfter(0);
_handler.setCompleteAfter(-1);
response=process("wibble");
check(response,"DISPATCHED");
response = process("wibble");
check(response, "DISPATCHED");
_handler.setResumeAfter(100);
_handler.setCompleteAfter(-1);
response=process("wibble");
check(response,"DISPATCHED");
response = process("wibble");
check(response, "DISPATCHED");
_handler.setResumeAfter(-1);
_handler.setCompleteAfter(0);
response=process("wibble");
check(response,"COMPLETED");
response = process("wibble");
check(response, "COMPLETED");
_handler.setResumeAfter(-1);
_handler.setCompleteAfter(100);
response=process("wibble");
check(response,"COMPLETED");
response = process("wibble");
check(response, "COMPLETED");
}
@Test
@ -218,345 +228,289 @@ public class LocalAsyncContextTest
_handler.setSuspendFor2(1000);
_handler.setResumeAfter2(200);
_handler.setCompleteAfter2(-1);
response=process(null);
check(response,"STARTASYNC","DISPATCHED","startasync","STARTASYNC","DISPATCHED");
spinAssertEquals(1,()->{return __completed.get()==null?0:1;});
spinAssertEquals(0,()->{return __completed1.get()==null?0:1;});
response = process(null);
check(response, "STARTASYNC", "DISPATCHED", "startasync", "STARTASYNC2", "DISPATCHED");
spinAssertEquals(1, () ->
{
try (Locker.Lock lock = _completeLock.lock())
{
return __completed == null ? 0 : 1;
}
});
spinAssertEquals(0, () -> __completed1.get() == null ? 0 : 1);
}
protected void check(String response,String... content)
protected void check(String response, String... content)
{
Assert.assertThat(response,Matchers.startsWith("HTTP/1.1 200 OK"));
int i=0;
for (String m:content)
Assert.assertThat(response, Matchers.startsWith("HTTP/1.1 200 OK"));
int i = 0;
for (String m : content)
{
Assert.assertThat(response,Matchers.containsString(m));
i=response.indexOf(m,i);
i+=m.length();
Assert.assertThat(response, Matchers.containsString(m));
i = response.indexOf(m, i);
i += m.length();
}
}
private synchronized String process(String content) throws Exception
{
String request = "GET / HTTP/1.1\r\n" +
"Host: localhost\r\n"+
"Connection: close\r\n";
"Host: localhost\r\n" +
"Connection: close\r\n";
if (content==null)
request+="\r\n";
if (content == null)
request += "\r\n";
else
request+="Content-Length: "+content.length()+"\r\n" +"\r\n" + content;
request += "Content-Length: " + content.length() + "\r\n" + "\r\n" + content;
String response=getResponse(request);
return response;
return getResponse(request);
}
protected String getResponse(String request) throws Exception
{
LocalConnector connector=(LocalConnector)_connector;
LocalConnector connector = (LocalConnector)_connector;
LocalConnector.LocalEndPoint endp = connector.executeRequest(request);
endp.waitUntilClosed();
return endp.takeOutputString();
}
private static class SuspendHandler extends HandlerWrapper
private class SuspendHandler extends HandlerWrapper
{
private int _read;
private long _suspendFor=-1;
private long _resumeAfter=-1;
private long _completeAfter=-1;
private long _suspendFor2=-1;
private long _resumeAfter2=-1;
private long _completeAfter2=-1;
private long _suspendFor = -1;
private long _resumeAfter = -1;
private long _completeAfter = -1;
private long _suspendFor2 = -1;
private long _resumeAfter2 = -1;
private long _completeAfter2 = -1;
public SuspendHandler()
{
}
public int getRead()
{
return _read;
}
public void setRead(int read)
{
_read = read;
}
public long getSuspendFor()
{
return _suspendFor;
}
public void setSuspendFor(long suspendFor)
{
_suspendFor = suspendFor;
}
public long getResumeAfter()
{
return _resumeAfter;
}
public void setResumeAfter(long resumeAfter)
{
_resumeAfter = resumeAfter;
}
public long getCompleteAfter()
{
return _completeAfter;
}
public void setCompleteAfter(long completeAfter)
{
_completeAfter = completeAfter;
}
/* ------------------------------------------------------------ */
/** Get the suspendFor2.
* @return the suspendFor2
*/
public long getSuspendFor2()
{
return _suspendFor2;
}
/* ------------------------------------------------------------ */
/** Set the suspendFor2.
* @param suspendFor2 the suspendFor2 to set
*/
public void setSuspendFor2(long suspendFor2)
{
_suspendFor2 = suspendFor2;
}
/* ------------------------------------------------------------ */
/** Get the resumeAfter2.
* @return the resumeAfter2
*/
public long getResumeAfter2()
{
return _resumeAfter2;
}
/* ------------------------------------------------------------ */
/** Set the resumeAfter2.
* @param resumeAfter2 the resumeAfter2 to set
*/
public void setResumeAfter2(long resumeAfter2)
{
_resumeAfter2 = resumeAfter2;
}
/* ------------------------------------------------------------ */
/** Get the completeAfter2.
* @return the completeAfter2
*/
public long getCompleteAfter2()
{
return _completeAfter2;
}
/* ------------------------------------------------------------ */
/** Set the completeAfter2.
* @param completeAfter2 the completeAfter2 to set
*/
public void setCompleteAfter2(long completeAfter2)
{
_completeAfter2 = completeAfter2;
}
/* ------------------------------------------------------------ */
@Override
public void handle(String target, final Request baseRequest, final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException
{
try
if (DispatcherType.REQUEST.equals(baseRequest.getDispatcherType()))
{
if (DispatcherType.REQUEST.equals(baseRequest.getDispatcherType()))
if (_read > 0)
{
if (_read>0)
{
byte[] buf=new byte[_read];
request.getInputStream().read(buf);
}
else if (_read<0)
{
InputStream in = request.getInputStream();
int b=in.read();
while(b!=-1)
b=in.read();
}
int read = _read;
byte[] buf = new byte[read];
while (read > 0)
read -= request.getInputStream().read(buf);
}
else if (_read < 0)
{
InputStream in = request.getInputStream();
int b = in.read();
while (b != -1)
b = in.read();
}
final AsyncContext asyncContext = baseRequest.startAsync();
response.getOutputStream().println("STARTASYNC");
asyncContext.addListener(__asyncListener);
asyncContext.addListener(__asyncListener1);
if (_suspendFor > 0)
asyncContext.setTimeout(_suspendFor);
if (_completeAfter > 0)
{
new Thread()
{
@Override
public void run()
{
try
{
Thread.sleep(_completeAfter);
response.getOutputStream().println("COMPLETED");
response.setStatus(200);
baseRequest.setHandled(true);
asyncContext.complete();
}
catch (Exception e)
{
e.printStackTrace();
}
}
}.start();
}
else if (_completeAfter == 0)
{
response.getOutputStream().println("COMPLETED");
response.setStatus(200);
baseRequest.setHandled(true);
asyncContext.complete();
}
if (_resumeAfter > 0)
{
new Thread()
{
@Override
public void run()
{
try
{
Thread.sleep(_resumeAfter);
if (((HttpServletRequest)asyncContext.getRequest()).getSession(true).getId() != null)
asyncContext.dispatch();
}
catch (Exception e)
{
e.printStackTrace();
}
}
}.start();
}
else if (_resumeAfter == 0)
{
asyncContext.dispatch();
}
}
else
{
if (request.getAttribute("TIMEOUT") != null)
response.getOutputStream().println("TIMEOUT");
else
response.getOutputStream().println("DISPATCHED");
if (_suspendFor2 >= 0)
{
final AsyncContext asyncContext = baseRequest.startAsync();
response.getOutputStream().println("STARTASYNC");
asyncContext.addListener(__asyncListener);
asyncContext.addListener(__asyncListener1);
if (_suspendFor>0)
asyncContext.setTimeout(_suspendFor);
response.getOutputStream().println("STARTASYNC2");
if (_suspendFor2 > 0)
asyncContext.setTimeout(_suspendFor2);
_suspendFor2 = -1;
if (_completeAfter>0)
if (_completeAfter2 > 0)
{
new Thread() {
new Thread()
{
@Override
public void run()
{
try
{
Thread.sleep(_completeAfter);
response.getOutputStream().println("COMPLETED");
Thread.sleep(_completeAfter2);
response.getOutputStream().println("COMPLETED2");
response.setStatus(200);
baseRequest.setHandled(true);
asyncContext.complete();
}
catch(Exception e)
catch (Exception e)
{
e.printStackTrace();
}
}
}.start();
}
else if (_completeAfter==0)
else if (_completeAfter2 == 0)
{
response.getOutputStream().println("COMPLETED");
response.getOutputStream().println("COMPLETED2");
response.setStatus(200);
baseRequest.setHandled(true);
asyncContext.complete();
}
if (_resumeAfter>0)
if (_resumeAfter2 > 0)
{
new Thread() {
new Thread()
{
@Override
public void run()
{
try
{
Thread.sleep(_resumeAfter);
if(((HttpServletRequest)asyncContext.getRequest()).getSession(true).getId()!=null)
asyncContext.dispatch();
Thread.sleep(_resumeAfter2);
asyncContext.dispatch();
}
catch(Exception e)
catch (Exception e)
{
e.printStackTrace();
}
}
}.start();
}
else if (_resumeAfter==0)
else if (_resumeAfter2 == 0)
{
asyncContext.dispatch();
}
}
else
{
if (request.getAttribute("TIMEOUT")!=null)
{
response.getOutputStream().println("TIMEOUT");
}
else
{
response.getOutputStream().println("DISPATCHED");
}
if (_suspendFor2>=0)
{
final AsyncContext asyncContext = baseRequest.startAsync();
response.getOutputStream().println("STARTASYNC2");
if (_suspendFor2>0)
asyncContext.setTimeout(_suspendFor2);
_suspendFor2=-1;
if (_completeAfter2>0)
{
new Thread() {
@Override
public void run()
{
try
{
Thread.sleep(_completeAfter2);
response.getOutputStream().println("COMPLETED2");
response.setStatus(200);
baseRequest.setHandled(true);
asyncContext.complete();
}
catch(Exception e)
{
e.printStackTrace();
}
}
}.start();
}
else if (_completeAfter2==0)
{
response.getOutputStream().println("COMPLETED2");
response.setStatus(200);
baseRequest.setHandled(true);
asyncContext.complete();
}
if (_resumeAfter2>0)
{
new Thread() {
@Override
public void run()
{
try
{
Thread.sleep(_resumeAfter2);
asyncContext.dispatch();
}
catch(Exception e)
{
e.printStackTrace();
}
}
}.start();
}
else if (_resumeAfter2==0)
{
asyncContext.dispatch();
}
}
else
{
response.setStatus(200);
baseRequest.setHandled(true);
}
response.setStatus(200);
baseRequest.setHandled(true);
}
}
finally
{
}
}
}
static AtomicReference<Throwable> __completed = new AtomicReference<>();
static AtomicReference<Throwable> __completed1 = new AtomicReference<>();
private static AsyncListener __asyncListener = new AsyncListener()
private AsyncListener __asyncListener = new AsyncListener()
{
@Override
public void onComplete(AsyncEvent event) throws IOException
{
Throwable complete = new Throwable();
if (!__completed.compareAndSet(null,complete))
Throwable dispatched = HttpChannel.getDispatchedFrom();
try (Locker.Lock lock = _completeLock.lock())
{
__completed.get().printStackTrace();
complete.printStackTrace();
__completed.set(null);
throw new IllegalStateException();
if (__completed == null)
{
__completed = complete;
__dispatched = dispatched;
}
else
{
System.err.println("First onCompleted dispatched from:");
if (__dispatched != null)
__dispatched.printStackTrace();
System.err.println("First onCompleted:");
__completed.printStackTrace();
System.err.println("Second onCompleted dispatched from:");
if (dispatched != null)
dispatched.printStackTrace();
complete.printStackTrace();
throw new IllegalStateException();
}
}
}
@ -564,12 +518,27 @@ public class LocalAsyncContextTest
public void onError(AsyncEvent event) throws IOException
{
Throwable complete = new Throwable();
if (!__completed.compareAndSet(null,complete))
Throwable dispatched = HttpChannel.getDispatchedFrom();
try (Locker.Lock lock = _completeLock.lock())
{
__completed.get().printStackTrace();
complete.printStackTrace();
__completed.set(null);
throw new IllegalStateException();
if (__completed == null)
{
__completed = complete;
__dispatched = dispatched;
}
else
{
System.err.println("First onCompleted dispatched from:");
if (__dispatched != null)
__dispatched.printStackTrace();
System.err.println("First onCompleted:");
__completed.printStackTrace();
System.err.println("Second onCompleted dispatched from:");
if (dispatched != null)
dispatched.printStackTrace();
complete.printStackTrace();
throw new IllegalStateException();
}
}
}
@ -583,18 +552,18 @@ public class LocalAsyncContextTest
@Override
public void onTimeout(AsyncEvent event) throws IOException
{
event.getSuppliedRequest().setAttribute("TIMEOUT",Boolean.TRUE);
event.getSuppliedRequest().setAttribute("TIMEOUT", Boolean.TRUE);
event.getAsyncContext().dispatch();
}
};
private static AsyncListener __asyncListener1 = new AsyncListener()
private AsyncListener __asyncListener1 = new AsyncListener()
{
@Override
public void onComplete(AsyncEvent event) throws IOException
{
Throwable complete = new Throwable();
if (!__completed1.compareAndSet(null,complete))
if (!__completed1.compareAndSet(null, complete))
{
__completed1.get().printStackTrace();
complete.printStackTrace();
@ -607,7 +576,7 @@ public class LocalAsyncContextTest
public void onError(AsyncEvent event) throws IOException
{
Throwable complete = new Throwable();
if (!__completed1.compareAndSet(null,complete))
if (!__completed1.compareAndSet(null, complete))
{
__completed1.get().printStackTrace();
complete.printStackTrace();
@ -615,7 +584,7 @@ public class LocalAsyncContextTest
throw new IllegalStateException();
}
}
@Override
public void onStartAsync(AsyncEvent event) throws IOException
{
@ -625,24 +594,23 @@ public class LocalAsyncContextTest
public void onTimeout(AsyncEvent event) throws IOException
{
}
};
static <T> void spinAssertEquals(T expected, Supplier<T> actualSupplier)
{
spinAssertEquals(expected,actualSupplier,10,TimeUnit.SECONDS);
spinAssertEquals(expected, actualSupplier, 10, TimeUnit.SECONDS);
}
static <T> void spinAssertEquals(T expected, Supplier<T> actualSupplier, long waitFor, TimeUnit units)
{
long now = System.nanoTime();
long end = now+units.toNanos(waitFor);
T actual=null;
while(now < end)
long end = now + units.toNanos(waitFor);
T actual = null;
while (now < end)
{
actual=actualSupplier.get();
if (actual==null && expected==null ||
actual!=null && actual.equals(expected))
actual = actualSupplier.get();
if (actual == null && expected == null ||
actual != null && actual.equals(expected))
break;
try
{
@ -650,10 +618,11 @@ public class LocalAsyncContextTest
}
catch (InterruptedException e)
{
// Ignored
}
now = System.nanoTime();
}
assertEquals(expected,actual);
Assert.assertEquals(expected, actual);
}
}