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

415744 - Reduce Future usage in websocket

This commit is contained in:
Greg Wilkins 2013-08-23 19:58:46 +10:00
parent c27020740f
commit e4235ea070
20 changed files with 71 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/JettyEchoSocket.java
View File

@ -33,7 +33,7 @@ public class JettyEchoSocket extends WebSocketAdapter
@Override
public void onWebSocketBinary(byte[] payload, int offset, int len)
{
getRemote().sendBytesByFuture(BufferUtil.toBuffer(payload,offset,len));
getRemote().sendBytes(BufferUtil.toBuffer(payload,offset,len),null);
}
@Override
@ -45,6 +45,6 @@ public class JettyEchoSocket extends WebSocketAdapter
@Override
public void onWebSocketText(String message)
{
getRemote().sendStringByFuture(message);
getRemote().sendString(message,null);
}
}

2
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/JettyEchoSocket.java
View File

@ -70,7 +70,7 @@ public class JettyEchoSocket
public void onMessage(String msg)
{
incomingMessages.add(msg);
remote.sendStringByFuture(msg);
remote.sendString(msg,null);
}
@OnWebSocketConnect

2
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
View File

@ -116,7 +116,7 @@ public class WebSocketClientTest
Assert.assertThat("client.connectionManager.sessions.size",client.getConnectionManager().getSessions().size(),is(1));
cliSock.getSession().getRemote().sendStringByFuture("Hello World!");
cliSock.getSession().getRemote().sendString("Hello World!",null);
srvSock.echoMessage(1,TimeUnit.MILLISECONDS,500);
// wait for response from server
cliSock.waitForMessage(500,TimeUnit.MILLISECONDS);

19
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java Normal file
View File

@ -0,0 +1,19 @@
package org.eclipse.jetty.websocket.common;
import org.eclipse.jetty.util.BlockingCallback;
import org.eclipse.jetty.websocket.api.WriteCallback;
public class BlockingWriteCallback extends BlockingCallback implements WriteCallback
{
@Override
public void writeFailed(Throwable x)
{
failed(x);
}
@Override
public void writeSuccess()
{
succeeded();
}
}

37
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpoint.java
View File

@ -27,6 +27,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import org.eclipse.jetty.util.BlockingCallback;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@ -52,6 +53,18 @@ public class WebSocketRemoteEndpoint implements RemoteEndpoint
private static final int TEXT = 1;
private static final int BINARY = 2;
private static final int CONTROL = 3;
private static final WriteCallback NOOP_CALLBACK = new WriteCallback()
{
@Override
public void writeSuccess()
{
}
@Override
public void writeFailed(Throwable x)
{
}
};
private static final Logger LOG = Log.getLogger(WebSocketRemoteEndpoint.class);
public final LogicalConnection connection;
@ -72,19 +85,11 @@ public class WebSocketRemoteEndpoint implements RemoteEndpoint
private void blockingWrite(WebSocketFrame frame) throws IOException
{
Future<Void> fut = sendAsyncFrame(frame);
try
{
fut.get(); // block till done
}
catch (ExecutionException e)
{
throw new IOException("Failed to write bytes",e.getCause());
}
catch (InterruptedException e)
{
throw new IOException("Failed to write bytes",e);
}
// TODO Blocking callbacks can be recycled, but they do not handle concurrent calls,
// so if some mutual exclusion can be applied, then this callback can be reused.
BlockingWriteCallback callback = new BlockingWriteCallback();
sendFrame(frame,callback);
callback.block();
}
public InetSocketAddress getInetSocketAddress()
@ -150,13 +155,12 @@ public class WebSocketRemoteEndpoint implements RemoteEndpoint
@Override
public void sendBytes(ByteBuffer data, WriteCallback callback)
{
Objects.requireNonNull(callback,"WriteCallback cannot be null");
msgType.set(BINARY);
if (LOG.isDebugEnabled())
{
LOG.debug("sendBytes({}, {})",BufferUtil.toDetailString(data),callback);
}
sendFrame(new BinaryFrame().setPayload(data),callback);
sendFrame(new BinaryFrame().setPayload(data),callback==null?NOOP_CALLBACK:callback);
}
public void sendFrame(WebSocketFrame frame, WriteCallback callback)
@ -356,13 +360,12 @@ public class WebSocketRemoteEndpoint implements RemoteEndpoint
@Override
public void sendString(String text, WriteCallback callback)
{
Objects.requireNonNull(callback,"WriteCallback cannot be null");
msgType.set(TEXT);
TextFrame frame = new TextFrame().setPayload(text);
if (LOG.isDebugEnabled())
{
LOG.debug("sendString({},{})",BufferUtil.toDetailString(frame.getPayload()),callback);
}
sendFrame(frame,callback);
sendFrame(frame,callback==null?NOOP_CALLBACK:callback);
}
}

2
jetty-websocket/websocket-common/src/test/java/examples/echo/AnnotatedEchoSocket.java
View File

@ -35,7 +35,7 @@ public class AnnotatedEchoSocket
{
System.out.printf("Echoing back message [%s]%n",message);
// echo the message back
session.getRemote().sendStringByFuture(message);
session.getRemote().sendString(message,null);
}
}
}

2
jetty-websocket/websocket-common/src/test/java/examples/echo/ListenerEchoSocket.java
View File

@ -59,7 +59,7 @@ public class ListenerEchoSocket implements WebSocketListener
{
System.out.printf("Echoing back message [%s]%n",message);
// echo the message back
outbound.getRemote().sendStringByFuture(message);
outbound.getRemote().sendString(message,null);
}
}
}

2
jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/annotations/MyStatelessEchoSocket.java
View File

@ -36,6 +36,6 @@ public class MyStatelessEchoSocket
@OnWebSocketMessage
public void onText(Session session, String text)
{
session.getRemote().sendStringByFuture(text);
session.getRemote().sendString(text,null);
}
}

2
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/LoadTest.java
View File

@ -69,7 +69,7 @@ public class LoadTest
@OnWebSocketMessage
public void onWebSocketText(String message)
{
session.getRemote().sendStringByFuture(message);
session.getRemote().sendString(message,null);
long iter = count.incrementAndGet();
if ((iter % 100) == 0)
{

4
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/ABSocket.java
View File

@ -46,7 +46,7 @@ public class ABSocket
// echo the message back.
ByteBuffer data = ByteBuffer.wrap(buf,offset,len);
this.session.getRemote().sendBytesByFuture(data);
this.session.getRemote().sendBytes(data,null);
}
@OnWebSocketConnect
@ -73,7 +73,7 @@ public class ABSocket
try
{
// echo the message back.
this.session.getRemote().sendStringByFuture(message);
this.session.getRemote().sendString(message,null);
}
catch (WebSocketException e)
{

4
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java
View File

@ -67,7 +67,7 @@ public class BrowserSocket
randomText[i] = letters[rand.nextInt(lettersLen)];
}
msg = String.format("ManyThreads [%s]",String.valueOf(randomText));
remote.sendStringByFuture(msg);
remote.sendString(msg,null);
}
}
}
@ -219,7 +219,7 @@ public class BrowserSocket
}
// Async write
remote.sendStringByFuture(message);
remote.sendString(message,null);
}
private void writeMessage(String format, Object... args)

4
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/BigEchoSocket.java
View File

@ -42,7 +42,7 @@ public class BigEchoSocket
LOG.warn("Session is closed");
return;
}
session.getRemote().sendBytesByFuture(ByteBuffer.wrap(buf,offset,length));
session.getRemote().sendBytes(ByteBuffer.wrap(buf,offset,length),null);
}
@OnWebSocketMessage
@ -53,6 +53,6 @@ public class BigEchoSocket
LOG.warn("Session is closed");
return;
}
session.getRemote().sendStringByFuture(message);
session.getRemote().sendString(message,null);
}
}

4
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoBroadcastSocket.java
View File

@ -40,7 +40,7 @@ public class EchoBroadcastSocket
ByteBuffer data = ByteBuffer.wrap(buf,offset,len);
for (EchoBroadcastSocket sock : BROADCAST)
{
sock.session.getRemote().sendBytesByFuture(data.slice());
sock.session.getRemote().sendBytes(data.slice(),null);
}
}
@ -62,7 +62,7 @@ public class EchoBroadcastSocket
{
for (EchoBroadcastSocket sock : BROADCAST)
{
sock.session.getRemote().sendStringByFuture(text);
sock.session.getRemote().sendString(text,null);
}
}
}

8
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/examples/echo/EchoFragmentSocket.java
View File

@ -60,13 +60,13 @@ public class EchoFragmentSocket
switch (frame.getType())
{
case BINARY:
remote.sendBytesByFuture(buf1);
remote.sendBytesByFuture(buf2);
remote.sendBytes(buf1,null);
remote.sendBytes(buf2,null);
break;
case TEXT:
// NOTE: This impl is not smart enough to split on a UTF8 boundary
remote.sendStringByFuture(BufferUtil.toUTF8String(buf1));
remote.sendStringByFuture(BufferUtil.toUTF8String(buf2));
remote.sendString(BufferUtil.toUTF8String(buf1),null);
remote.sendString(BufferUtil.toUTF8String(buf2),null);
break;
default:
throw new IOException("Unexpected frame type: " + frame.getType());

4
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/EchoSocket.java
View File

@ -44,7 +44,7 @@ public class EchoSocket
// echo the message back.
ByteBuffer data = ByteBuffer.wrap(buf,offset,len);
this.session.getRemote().sendBytesByFuture(data);
this.session.getRemote().sendBytes(data,null);
}
@OnWebSocketConnect
@ -59,6 +59,6 @@ public class EchoSocket
LOG.debug("onText({})",message);
// echo the message back.
this.session.getRemote().sendStringByFuture(message);
this.session.getRemote().sendString(message,null);
}
}

4
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/RFCSocket.java
View File

@ -41,7 +41,7 @@ public class RFCSocket
// echo the message back.
ByteBuffer data = ByteBuffer.wrap(buf,offset,len);
this.session.getRemote().sendBytesByFuture(data);
this.session.getRemote().sendBytes(data,null);
}
@OnWebSocketConnect
@ -62,6 +62,6 @@ public class RFCSocket
}
// echo the message back.
this.session.getRemote().sendStringByFuture(message);
this.session.getRemote().sendString(message,null);
}
}

10
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SessionSocket.java
View File

@ -61,7 +61,7 @@ public class SessionSocket
if (values == null)
{
session.getRemote().sendStringByFuture("<null>");
session.getRemote().sendString("<null>",null);
return;
}
@ -78,21 +78,21 @@ public class SessionSocket
delim = true;
}
valueStr.append(']');
session.getRemote().sendStringByFuture(valueStr.toString());
session.getRemote().sendString(valueStr.toString(),null);
return;
}
if ("session.isSecure".equals(message))
{
String issecure = String.format("session.isSecure=%b",session.isSecure());
session.getRemote().sendStringByFuture(issecure);
session.getRemote().sendString(issecure,null);
return;
}
if ("session.upgradeRequest.requestURI".equals(message))
{
String response = String.format("session.upgradeRequest.requestURI=%s",session.getUpgradeRequest().getRequestURI().toASCIIString());
session.getRemote().sendStringByFuture(response);
session.getRemote().sendString(response,null);
return;
}
@ -103,7 +103,7 @@ public class SessionSocket
}
// echo the message back.
this.session.getRemote().sendStringByFuture(message);
this.session.getRemote().sendString(message,null);
}
catch (Throwable t)
{

2
jetty-websocket/websocket-servlet/src/test/java/examples/MyBinaryEchoSocket.java
View File

@ -34,6 +34,6 @@ public class MyBinaryEchoSocket
public void onWebSocketText(Session session, byte buf[], int offset, int len)
{
// Echo message back, asynchronously
session.getRemote().sendBytesByFuture(ByteBuffer.wrap(buf,offset,len));
session.getRemote().sendBytes(ByteBuffer.wrap(buf,offset,len),null);
}
}

2
jetty-websocket/websocket-servlet/src/test/java/examples/MyEchoSocket.java
View File

@ -32,6 +32,6 @@ public class MyEchoSocket
public void onWebSocketText(Session session, String message)
{
// Echo message back, asynchronously
session.getRemote().sendStringByFuture(message);
session.getRemote().sendString(message,null);
}
}

2
tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/WebSocketChatServlet.java
View File

@ -123,7 +123,7 @@ public class WebSocketChatServlet extends WebSocketServlet implements WebSocketC
}
// Async write the message back.
member.remote.sendStringByFuture(data);
member.remote.sendString(data,null);
}
}