andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow per-write promises and disallow promises on flush()

Browse Source 
- write() now accepts a ChannelPromise and returns ChannelFuture as most
  users expected.  It makes the user's life much easier because it is
  now much easier to get notified when a specific message has been
  written.
- flush() does not create a ChannelPromise nor returns ChannelFuture.
  It is now similar to what read() looks like.
This commit is contained in:
Norman Maurer 2013-07-10 13:00:42 +02:00 committed by Trustin Lee
parent dd763698dc
commit b57d9f307f
87 changed files with 470 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -9,4 +9,6 @@
/target
*/target
/reports
*/reports
*/reports
.DS_Store

3
codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
View File

@ -275,6 +275,9 @@ public abstract class HttpContentEncoder extends MessageToMessageCodec<HttpReque
if (buf == null) {
break;
}
if (!buf.isReadable()) {
continue;
}
out.add(new DefaultHttpContent(buf));
}
}

6
codec-http/src/main/java/io/netty/handler/codec/http/HttpObjectEncoder.java
View File

@ -15,10 +15,6 @@
*/
package io.netty.handler.codec.http;
import static io.netty.handler.codec.http.HttpConstants.COLON;
import static io.netty.handler.codec.http.HttpConstants.CR;
import static io.netty.handler.codec.http.HttpConstants.LF;
import static io.netty.handler.codec.http.HttpConstants.SP;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder;
@ -27,6 +23,8 @@ import io.netty.util.CharsetUtil;
import java.util.List;
import java.util.Map;
import static io.netty.handler.codec.http.HttpConstants.*;
/**
* Encodes an {@link HttpMessage} or an {@link HttpContent} into
* a {@link ByteBuf}.

3
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
View File

@ -54,6 +54,7 @@
package io.netty.handler.codec.http.websocketx;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.CorruptedFrameException;
@ -403,7 +404,7 @@ public class WebSocket08FrameDecoder extends ReplayingDecoder<WebSocket08FrameDe
private void protocolViolation(ChannelHandlerContext ctx, String reason) {
checkpoint(State.CORRUPT);
if (ctx.channel().isActive()) {
ctx.flush().addListener(ChannelFutureListener.CLOSE);
ctx.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
}
throw new CorruptedFrameException(reason);
}

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
View File

@ -159,7 +159,7 @@ public abstract class WebSocketClientHandshaker {
} else {
decoder.setSingleDecode(true);
}
channel.write(request).flush().addListener(new ChannelFutureListener() {
channel.writeAndFlush(request).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) {
if (future.isSuccess()) {
@ -264,6 +264,6 @@ public abstract class WebSocketClientHandshaker {
if (channel == null) {
throw new NullPointerException("channel");
}
return channel.write(frame).flush(promise);
return channel.writeAndFlush(frame, promise);
}
}

2
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketProtocolHandler.java
View File

@ -26,7 +26,7 @@ abstract class WebSocketProtocolHandler extends MessageToMessageDecoder<WebSocke
protected void decode(ChannelHandlerContext ctx, WebSocketFrame frame, List<Object> out) throws Exception {
if (frame instanceof PingWebSocketFrame) {
frame.content().retain();
ctx.channel().write(new PongWebSocketFrame(frame.content())).flush();
ctx.channel().writeAndFlush(new PongWebSocketFrame(frame.content()));
return;
}
if (frame instanceof PongWebSocketFrame) {

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
View File

@ -158,7 +158,7 @@ public abstract class WebSocketServerHandshaker {
logger.debug(String.format("%s WS Version %s server handshake", channel, version()));
}
FullHttpResponse response = newHandshakeResponse(req, responseHeaders);
channel.write(response).flush().addListener(new ChannelFutureListener() {
channel.writeAndFlush(response).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
if (future.isSuccess()) {
@ -225,7 +225,7 @@ public abstract class WebSocketServerHandshaker {
if (channel == null) {
throw new NullPointerException("channel");
}
return channel.write(frame).flush(promise).addListener(ChannelFutureListener.CLOSE);
return channel.writeAndFlush(frame, promise).addListener(ChannelFutureListener.CLOSE);
}
/**

2
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
View File

@ -177,7 +177,7 @@ public class WebSocketServerHandshaker00 extends WebSocketServerHandshaker {
*/
@Override
public ChannelFuture close(Channel channel, CloseWebSocketFrame frame, ChannelPromise promise) {
return channel.write(frame).flush(promise);
return channel.writeAndFlush(frame, promise);
}
@Override

4
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandler.java
View File

@ -107,7 +107,7 @@ public class WebSocketServerProtocolHandler extends WebSocketProtocolHandler {
if (cause instanceof WebSocketHandshakeException) {
FullHttpResponse response = new DefaultFullHttpResponse(
HTTP_1_1, HttpResponseStatus.BAD_REQUEST, Unpooled.wrappedBuffer(cause.getMessage().getBytes()));
ctx.channel().write(response).flush().addListener(ChannelFutureListener.CLOSE);
ctx.channel().writeAndFlush(response).addListener(ChannelFutureListener.CLOSE);
} else {
ctx.close();
}
@ -128,7 +128,7 @@ public class WebSocketServerProtocolHandler extends WebSocketProtocolHandler {
if (msg instanceof FullHttpRequest) {
FullHttpResponse response =
new DefaultFullHttpResponse(HTTP_1_1, HttpResponseStatus.FORBIDDEN);
ctx.channel().write(response).flush();
ctx.channel().writeAndFlush(response);
} else {
ctx.fireChannelRead(msg);
}

2
codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
View File

@ -82,7 +82,7 @@ class WebSocketServerProtocolHandshakeHandler
}
private static void sendHttpResponse(ChannelHandlerContext ctx, HttpRequest req, HttpResponse res) {
ChannelFuture f = ctx.channel().write(res).flush();
ChannelFuture f = ctx.channel().writeAndFlush(res);
if (!isKeepAlive(req) || res.getStatus().code() != 200) {
f.addListener(ChannelFutureListener.CLOSE);
}

22
codec-http/src/main/java/io/netty/handler/codec/spdy/SpdySessionHandler.java
View File

@ -159,7 +159,7 @@ public class SpdySessionHandler
while (spdyDataFrame.content().readableBytes() > initialReceiveWindowSize) {
SpdyDataFrame partialDataFrame = new DefaultSpdyDataFrame(streamId,
spdyDataFrame.content().readSlice(initialReceiveWindowSize).retain());
ctx.write(partialDataFrame).flush();
ctx.writeAndFlush(partialDataFrame);
}
}
@ -169,7 +169,7 @@ public class SpdySessionHandler
spdySession.updateReceiveWindowSize(streamId, deltaWindowSize);
SpdyWindowUpdateFrame spdyWindowUpdateFrame =
new DefaultSpdyWindowUpdateFrame(streamId, deltaWindowSize);
ctx.write(spdyWindowUpdateFrame).flush();
ctx.writeAndFlush(spdyWindowUpdateFrame);
}
}
@ -307,7 +307,7 @@ public class SpdySessionHandler
SpdyPingFrame spdyPingFrame = (SpdyPingFrame) msg;
if (isRemoteInitiatedID(spdyPingFrame.getId())) {
ctx.write(spdyPingFrame).flush();
ctx.writeAndFlush(spdyPingFrame);
return;
}
@ -392,7 +392,7 @@ public class SpdySessionHandler
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
if (msg instanceof SpdyDataFrame ||
msg instanceof SpdySynStreamFrame ||
msg instanceof SpdySynReplyFrame ||
@ -403,13 +403,13 @@ public class SpdySessionHandler
msg instanceof SpdyHeadersFrame ||
msg instanceof SpdyWindowUpdateFrame) {
handleOutboundMessage(ctx, msg);
handleOutboundMessage(ctx, msg, promise);
} else {
ctx.write(msg);
ctx.write(msg, promise);
}
}
private void handleOutboundMessage(ChannelHandlerContext ctx, Object msg) throws Exception {
private void handleOutboundMessage(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
if (msg instanceof SpdyDataFrame) {
SpdyDataFrame spdyDataFrame = (SpdyDataFrame) msg;
@ -470,7 +470,7 @@ public class SpdySessionHandler
// }
//});
ctx.write(partialDataFrame);
ctx.write(partialDataFrame, promise);
return;
} else {
// Window size is large enough to send entire data frame
@ -599,7 +599,7 @@ public class SpdySessionHandler
throw PROTOCOL_EXCEPTION;
}
ctx.write(msg);
ctx.write(msg, promise);
}
/*
@ -633,7 +633,7 @@ public class SpdySessionHandler
removeStream(ctx, streamId);
SpdyRstStreamFrame spdyRstStreamFrame = new DefaultSpdyRstStreamFrame(streamId, status);
ctx.write(spdyRstStreamFrame).flush();
ctx.writeAndFlush(spdyRstStreamFrame);
if (fireChannelRead) {
ctx.fireChannelRead(spdyRstStreamFrame);
}
@ -827,7 +827,7 @@ public class SpdySessionHandler
if (!sentGoAwayFrame) {
sentGoAwayFrame = true;
SpdyGoAwayFrame spdyGoAwayFrame = new DefaultSpdyGoAwayFrame(lastGoodStreamId, status);
return ctx.write(spdyGoAwayFrame).flush();
return ctx.writeAndFlush(spdyGoAwayFrame);
} else {
return ctx.newSucceededFuture();
}

6
codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandlerTest.java
View File

@ -146,13 +146,13 @@ public class WebSocketServerProtocolHandlerTest {
private class MockOutboundHandler extends ChannelOutboundHandlerAdapter {
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
responses.add((FullHttpResponse) msg);
promise.setSuccess();
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
promise.setSuccess();
public void flush(ChannelHandlerContext ctx) throws Exception {
}
}

2
codec-http/src/test/java/io/netty/handler/codec/spdy/SpdyFrameDecoderTest.java
View File

@ -103,7 +103,7 @@ public class SpdyFrameDecoderTest {
}
private static void sendAndWaitForFrame(Channel cc, SpdyFrame frame, CaptureHandler handler) {
cc.write(frame).flush();
cc.writeAndFlush(frame);
long theFuture = System.currentTimeMillis() + 3000;
while (handler.message == null && System.currentTimeMillis() < theFuture) {
try {

14
codec-http/src/test/java/io/netty/handler/codec/spdy/SpdySessionHandlerTest.java
View File

@ -288,18 +288,18 @@ public class SpdySessionHandlerTest {
SpdySynStreamFrame spdySynStreamFrame =
new DefaultSpdySynStreamFrame(streamId, 0, (byte) 0);
spdySynStreamFrame.setLast(true);
ctx.write(spdySynStreamFrame).flush();
ctx.writeAndFlush(spdySynStreamFrame);
spdySynStreamFrame.setStreamId(spdySynStreamFrame.getStreamId() + 2);
ctx.write(spdySynStreamFrame).flush();
ctx.writeAndFlush(spdySynStreamFrame);
spdySynStreamFrame.setStreamId(spdySynStreamFrame.getStreamId() + 2);
ctx.write(spdySynStreamFrame).flush();
ctx.writeAndFlush(spdySynStreamFrame);
spdySynStreamFrame.setStreamId(spdySynStreamFrame.getStreamId() + 2);
ctx.write(spdySynStreamFrame).flush();
ctx.writeAndFlush(spdySynStreamFrame);
// Limit the number of concurrent streams to 3
SpdySettingsFrame spdySettingsFrame = new DefaultSpdySettingsFrame();
spdySettingsFrame.setValue(SpdySettingsFrame.SETTINGS_MAX_CONCURRENT_STREAMS, 3);
ctx.write(spdySettingsFrame).flush();
ctx.writeAndFlush(spdySettingsFrame);
}
@Override
@ -315,7 +315,7 @@ public class SpdySessionHandlerTest {
spdySynReplyFrame.headers().add(entry.getKey(), entry.getValue());
}
ctx.write(spdySynReplyFrame).flush();
ctx.writeAndFlush(spdySynReplyFrame);
}
return;
}
@ -328,7 +328,7 @@ public class SpdySessionHandlerTest {
msg instanceof SpdyPingFrame ||
msg instanceof SpdyHeadersFrame) {
ctx.write(msg).flush();
ctx.writeAndFlush(msg);
return;
}

5
codec/src/main/java/io/netty/handler/codec/ByteToMessageCodec.java
View File

@ -18,6 +18,7 @@ package io.netty.handler.codec;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
import io.netty.util.internal.TypeParameterMatcher;
import java.util.List;
@ -83,8 +84,8 @@ public abstract class ByteToMessageCodec<I> extends ChannelDuplexHandler {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
encoder.write(ctx, msg);
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
encoder.write(ctx, msg, promise);
}
/**

17
codec/src/main/java/io/netty/handler/codec/MessageToByteEncoder.java
View File

@ -16,8 +16,10 @@
package io.netty.handler.codec;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter;
import io.netty.channel.ChannelPromise;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.internal.TypeParameterMatcher;
@ -67,7 +69,7 @@ public abstract class MessageToByteEncoder<I> extends ChannelOutboundHandlerAdap
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
ByteBuf buf = null;
try {
if (acceptOutboundMessage(msg)) {
@ -85,13 +87,16 @@ public abstract class MessageToByteEncoder<I> extends ChannelOutboundHandlerAdap
} finally {
ReferenceCountUtil.release(cast);
}
} else {
ctx.write(msg);
}
if (buf != null && buf.isReadable()) {
ctx.write(buf);
if (buf.isReadable()) {
ctx.write(buf, promise);
} else {
buf.release();
ctx.write(Unpooled.EMPTY_BUFFER, promise);
}
buf = null;
} else {
ctx.write(msg, promise);
}
} catch (EncoderException e) {
throw e;

5
codec/src/main/java/io/netty/handler/codec/MessageToMessageCodec.java
View File

@ -17,6 +17,7 @@ package io.netty.handler.codec;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
import io.netty.util.ReferenceCounted;
import io.netty.util.internal.TypeParameterMatcher;
@ -101,8 +102,8 @@ public abstract class MessageToMessageCodec<INBOUND_IN, OUTBOUND_IN> extends Cha
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
encoder.write(ctx, msg);
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
encoder.write(ctx, msg, promise);
}
/**

27
codec/src/main/java/io/netty/handler/codec/MessageToMessageEncoder.java
View File

@ -17,9 +17,11 @@ package io.netty.handler.codec;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter;
import io.netty.channel.ChannelPromise;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.ReferenceCounted;
import io.netty.util.internal.RecyclableArrayList;
import io.netty.util.internal.StringUtil;
import io.netty.util.internal.TypeParameterMatcher;
import java.util.List;
@ -62,10 +64,11 @@ public abstract class MessageToMessageEncoder<I> extends ChannelOutboundHandlerA
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
RecyclableArrayList out = RecyclableArrayList.newInstance();
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
RecyclableArrayList out = null;
try {
if (acceptOutboundMessage(msg)) {
out = RecyclableArrayList.newInstance();
@SuppressWarnings("unchecked")
I cast = (I) msg;
try {
@ -73,18 +76,30 @@ public abstract class MessageToMessageEncoder<I> extends ChannelOutboundHandlerA
} finally {
ReferenceCountUtil.release(cast);
}
if (out.isEmpty()) {
out.recycle();
out = null;
throw new EncoderException(
StringUtil.simpleClassName(this) + " must produce at least one message.");
}
} else {
out.add(msg);
ctx.write(msg, promise);
}
} catch (EncoderException e) {
throw e;
} catch (Throwable t) {
throw new EncoderException(t);
} finally {
for (int i = 0; i < out.size(); i ++) {
ctx.write(out.get(i));
if (out != null) {
final int sizeMinusOne = out.size() - 1;
for (int i = 0; i < sizeMinusOne; i ++) {
ctx.write(out.get(i));
}
ctx.write(out.get(sizeMinusOne), promise);
out.recycle();
}
out.recycle();
}
}

2
codec/src/main/java/io/netty/handler/codec/compression/JZlibEncoder.java
View File

@ -385,7 +385,7 @@ public class JZlibEncoder extends ZlibEncoder {
}
}
return ctx.write(footer).flush(promise);
return ctx.writeAndFlush(footer, promise);
}
@Override

2
codec/src/main/java/io/netty/handler/codec/compression/JdkZlibEncoder.java
View File

@ -255,7 +255,7 @@ public class JdkZlibEncoder extends ZlibEncoder {
deflater.end();
}
return ctx.write(footer).flush(promise);
return ctx.writeAndFlush(footer, promise);
}
@Override

2
example/src/main/java/io/netty/example/discard/DiscardClientHandler.java
View File

@ -82,7 +82,7 @@ public class DiscardClientHandler extends SimpleChannelInboundHandler<Object> {
private void generateTraffic() {
// Flush the outbound buffer to the socket.
// Once flushed, generate the same amount of traffic again.
ctx.write(content.duplicate().retain()).flush().addListener(trafficGenerator);
ctx.writeAndFlush(content.duplicate().retain()).addListener(trafficGenerator);
}
private final ChannelFutureListener trafficGenerator = new ChannelFutureListener() {

2
example/src/main/java/io/netty/example/echo/EchoClientHandler.java
View File

@ -50,7 +50,7 @@ public class EchoClientHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelActive(ChannelHandlerContext ctx) {
ctx.write(firstMessage).flush();
ctx.writeAndFlush(firstMessage);
}
@Override

13
example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java
View File

@ -94,21 +94,18 @@ public class FactorialClientHandler extends SimpleChannelInboundHandler<BigInteg
private void sendNumbers() {
// Do not send more than 4096 numbers.
boolean finished = false;
for (int i = 0; i < 4096; i++) {
if (i <= count) {
ctx.write(Integer.valueOf(i));
ChannelFuture future = ctx.write(Integer.valueOf(i));
if (count == i) {
future.addListener(numberSender);
}
i ++;
} else {
finished = true;
break;
}
}
ChannelFuture f = ctx.flush();
if (!finished) {
f.addListener(numberSender);
}
ctx.flush();
}
private final ChannelFutureListener numberSender = new ChannelFutureListener() {

2
example/src/main/java/io/netty/example/factorial/FactorialServerHandler.java
View File

@ -43,7 +43,7 @@ public class FactorialServerHandler extends SimpleChannelInboundHandler<BigInteg
// Calculate the cumulative factorial and send it to the client.
lastMultiplier = msg;
factorial = factorial.multiply(msg);
ctx.write(factorial).flush();
ctx.writeAndFlush(factorial);
}
@Override

11
example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java
View File

@ -181,9 +181,8 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler<Ful
// Write the content.
ctx.write(new ChunkedFile(raf, 0, fileLength, 8192));
// Write the end marker
ctx.write(LastHttpContent.EMPTY_LAST_CONTENT);
ChannelFuture writeFuture = ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT);
ChannelFuture writeFuture = ctx.flush();
// Decide whether to close the connection or not.
if (!isKeepAlive(request)) {
// Close the connection when the whole content is written out.
@ -277,7 +276,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler<Ful
response.content().writeBytes(Unpooled.copiedBuffer(buf, CharsetUtil.UTF_8));
// Close the connection as soon as the error message is sent.
ctx.write(response).flush().addListener(ChannelFutureListener.CLOSE);
ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE);
}
private static void sendRedirect(ChannelHandlerContext ctx, String newUri) {
@ -285,7 +284,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler<Ful
response.headers().set(LOCATION, newUri);
// Close the connection as soon as the error message is sent.
ctx.write(response).flush().addListener(ChannelFutureListener.CLOSE);
ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE);
}
private static void sendError(ChannelHandlerContext ctx, HttpResponseStatus status) {
@ -294,7 +293,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler<Ful
response.headers().set(CONTENT_TYPE, "text/plain; charset=UTF-8");
// Close the connection as soon as the error message is sent.
ctx.write(response).flush().addListener(ChannelFutureListener.CLOSE);
ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE);
}
/**
@ -308,7 +307,7 @@ public class HttpStaticFileServerHandler extends SimpleChannelInboundHandler<Ful
setDateHeader(response);
// Close the connection as soon as the error message is sent.
ctx.write(response).flush().addListener(ChannelFutureListener.CLOSE);
ctx.writeAndFlush(response).addListener(ChannelFutureListener.CLOSE);
}
/**

6
example/src/main/java/io/netty/example/http/helloworld/HttpHelloWorldServerHandler.java
View File

@ -45,7 +45,7 @@ public class HttpHelloWorldServerHandler extends ChannelInboundHandlerAdapter {
HttpRequest req = (HttpRequest) msg;
if (is100ContinueExpected(req)) {
ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE)).flush();
ctx.write(new DefaultFullHttpResponse(HTTP_1_1, CONTINUE));
}
boolean keepAlive = isKeepAlive(req);
FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, OK, CONTENT.duplicate());
@ -53,10 +53,10 @@ public class HttpHelloWorldServerHandler extends ChannelInboundHandlerAdapter {
response.headers().set(CONTENT_LENGTH, response.content().readableBytes());
if (!keepAlive) {
ctx.write(response).flush().addListener(ChannelFutureListener.CLOSE);
ctx.write(response).addListener(ChannelFutureListener.CLOSE);
} else {
ctx.write(response);
response.headers().set(CONNECTION, Values.KEEP_ALIVE);
ctx.write(response);
}
}
}

6
example/src/main/java/io/netty/example/http/upload/HttpUploadClient.java
View File

@ -202,7 +202,7 @@ public class HttpUploadClient {
// send request
List<Entry<String, String>> entries = headers.entries();
channel.write(request).flush().sync();
channel.writeAndFlush(request).sync();
// Wait for the server to close the connection.
channel.closeFuture().sync();
@ -276,7 +276,7 @@ public class HttpUploadClient {
if (bodyRequestEncoder.isChunked()) {
// could do either request.isChunked()
// either do it through ChunkedWriteHandler
channel.write(bodyRequestEncoder).flush().awaitUninterruptibly();
channel.writeAndFlush(bodyRequestEncoder).awaitUninterruptibly();
}
// Do not clear here since we will reuse the InterfaceHttpData on the
@ -351,7 +351,7 @@ public class HttpUploadClient {
// test if request was chunked and if so, finish the write
if (bodyRequestEncoder.isChunked()) {
channel.write(bodyRequestEncoder).flush().awaitUninterruptibly();
channel.writeAndFlush(bodyRequestEncoder).awaitUninterruptibly();
}
// Now no more use of file representation (and list of HttpData)

2
example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java
View File

@ -313,7 +313,7 @@ public class HttpUploadServerHandler extends SimpleChannelInboundHandler<HttpObj
}
}
// Write the response.
ChannelFuture future = channel.write(response).flush();
ChannelFuture future = channel.writeAndFlush(response);
// Close the connection after the write operation is done if necessary.
if (close) {
future.addListener(ChannelFutureListener.CLOSE);

2
example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServerHandler.java
View File

@ -124,7 +124,7 @@ public class AutobahnServerHandler extends ChannelInboundHandlerAdapter {
}
// Send the response and close the connection if necessary.
ChannelFuture f = ctx.channel().write(res).flush();
ChannelFuture f = ctx.channel().writeAndFlush(res);
if (!isKeepAlive(req) || res.getStatus().code() != 200) {
f.addListener(ChannelFutureListener.CLOSE);
}

2
example/src/main/java/io/netty/example/http/websocketx/html5/CustomTextFrameHandler.java
View File

@ -23,6 +23,6 @@ public class CustomTextFrameHandler extends SimpleChannelInboundHandler<TextWebS
@Override
protected void channelRead0(ChannelHandlerContext ctx, TextWebSocketFrame frame) throws Exception {
String request = frame.text();
ctx.channel().write(new TextWebSocketFrame(request.toUpperCase()));
ctx.channel().writeAndFlush(new TextWebSocketFrame(request.toUpperCase()));
}
}

2
example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java
View File

@ -135,7 +135,7 @@ public class WebSocketServerHandler extends SimpleChannelInboundHandler<Object>
}
// Send the response and close the connection if necessary.
ChannelFuture f = ctx.channel().write(res).flush();
ChannelFuture f = ctx.channel().writeAndFlush(res);
if (!isKeepAlive(req) || res.getStatus().code() != 200) {
f.addListener(ChannelFutureListener.CLOSE);
}

2
example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
View File

@ -137,7 +137,7 @@ public class WebSocketSslServerHandler extends SimpleChannelInboundHandler<Objec
}
// Send the response and close the connection if necessary.
ChannelFuture f = ctx.channel().write(res).flush();
ChannelFuture f = ctx.channel().writeAndFlush(res);
if (!isKeepAlive(req) || res.getStatus().code() != 200) {
f.addListener(ChannelFutureListener.CLOSE);
}

2
example/src/main/java/io/netty/example/localecho/LocalEcho.java
View File

@ -97,7 +97,7 @@ public class LocalEcho {
}
// Sends the received line to the server.
lastWriteFuture = ch.write(line).flush();
lastWriteFuture = ch.writeAndFlush(line);
}
// Wait until all messages are flushed before closing the channel.

2
example/src/main/java/io/netty/example/proxy/HexDumpProxyBackendHandler.java
View File

@ -38,7 +38,7 @@ public class HexDumpProxyBackendHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception {
inboundChannel.write(msg).flush().addListener(new ChannelFutureListener() {
inboundChannel.writeAndFlush(msg).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
if (future.isSuccess()) {

4
example/src/main/java/io/netty/example/proxy/HexDumpProxyFrontendHandler.java
View File

@ -65,7 +65,7 @@ public class HexDumpProxyFrontendHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception {
if (outboundChannel.isActive()) {
outboundChannel.write(msg).flush().addListener(new ChannelFutureListener() {
outboundChannel.writeAndFlush(msg).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
if (future.isSuccess()) {
@ -97,7 +97,7 @@ public class HexDumpProxyFrontendHandler extends ChannelInboundHandlerAdapter {
*/
static void closeOnFlush(Channel ch) {
if (ch.isActive()) {
ch.write(Unpooled.EMPTY_BUFFER).flush().addListener(ChannelFutureListener.CLOSE);
ch.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
}
}
}

4
example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java
View File

@ -53,9 +53,9 @@ public class QuoteOfTheMomentClient {
Channel ch = b.bind(0).sync().channel();
// Broadcast the QOTM request to port 8080.
ch.write(new DatagramPacket(
ch.writeAndFlush(new DatagramPacket(
Unpooled.copiedBuffer("QOTM?", CharsetUtil.UTF_8),
new InetSocketAddress("255.255.255.255", port))).flush().sync();
new InetSocketAddress("255.255.255.255", port))).sync();
// QuoteOfTheMomentClientHandler will close the DatagramChannel when a
// response is received. If the channel is not closed within 5 seconds,

2
example/src/main/java/io/netty/example/securechat/SecureChatClient.java
View File

@ -60,7 +60,7 @@ public class SecureChatClient {
}
// Sends the received line to the server.
lastWriteFuture = ch.write(line + "\r\n").flush();
lastWriteFuture = ch.writeAndFlush(line + "\r\n");
// If user typed the 'bye' command, wait until the server closes
// the connection.

2
example/src/main/java/io/netty/example/socksproxy/RelayHandler.java
View File

@ -43,7 +43,7 @@ public final class RelayHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
if (relayChannel.isActive()) {
relayChannel.write(msg).flush();
relayChannel.writeAndFlush(msg);
} else {
ReferenceCountUtil.release(msg);
}

2
example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java
View File

@ -43,7 +43,7 @@ public final class SocksServerConnectHandler extends SimpleChannelInboundHandler
CallbackNotifier cb = new CallbackNotifier() {
@Override
public void onSuccess(final ChannelHandlerContext outboundCtx) {
ctx.channel().write(new SocksCmdResponse(SocksCmdStatus.SUCCESS, request.addressType())).flush()
ctx.channel().writeAndFlush(new SocksCmdResponse(SocksCmdStatus.SUCCESS, request.addressType()))
.addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture channelFuture) throws Exception {

2
example/src/main/java/io/netty/example/socksproxy/SocksServerUtils.java
View File

@ -30,7 +30,7 @@ public final class SocksServerUtils {
*/
public static void closeOnFlush(Channel ch) {
if (ch.isActive()) {
ch.write(Unpooled.EMPTY_BUFFER).flush().addListener(ChannelFutureListener.CLOSE);
ch.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
}
}
}

2
example/src/main/java/io/netty/example/telnet/TelnetClient.java
View File

@ -59,7 +59,7 @@ public class TelnetClient {
}
// Sends the received line to the server.
lastWriteFuture = ch.write(line + "\r\n").flush();
lastWriteFuture = ch.writeAndFlush(line + "\r\n");
// If user typed the 'bye' command, wait until the server closes
// the connection.

2
example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java
View File

@ -59,7 +59,7 @@ public class TelnetServerHandler extends SimpleChannelInboundHandler<String> {
// We do not need to write a ChannelBuffer here.
// We know the encoder inserted at TelnetPipelineFactory will do the conversion.
ChannelFuture future = ctx.write(response).flush();
ChannelFuture future = ctx.writeAndFlush(response);
// Close the connection after sending 'Have a good day!'
// if the client has sent 'bye'.

8
handler/src/main/java/io/netty/handler/logging/LoggingHandler.java
View File

@ -297,17 +297,17 @@ public class LoggingHandler extends ChannelDuplexHandler {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
logMessage(ctx, "WRITE", msg);
ctx.write(msg);
ctx.write(msg, promise);
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
public void flush(ChannelHandlerContext ctx) throws Exception {
if (logger.isEnabled(internalLevel)) {
logger.log(internalLevel, format(ctx, "FLUSH"));
}
ctx.flush(promise);
ctx.flush();
}
private void logMessage(ChannelHandlerContext ctx, String eventName, Object msg) {

41
handler/src/main/java/io/netty/handler/ssl/SslHandler.java
View File

@ -27,7 +27,6 @@ import io.netty.channel.ChannelInboundHandler;
import io.netty.channel.ChannelOutboundHandler;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import io.netty.channel.ChannelPromiseNotifier;
import io.netty.handler.codec.ByteToMessageDecoder;
import io.netty.util.concurrent.DefaultPromise;
import io.netty.util.concurrent.EventExecutor;
@ -322,7 +321,8 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
engine.closeOutbound();
future.addListener(closeNotifyWriteListener);
try {
flush(ctx, future);
write(ctx, Unpooled.EMPTY_BUFFER, future);
flush(ctx);
} catch (Exception e) {
if (!future.tryFailure(e)) {
logger.warn("flush() raised a masked exception.", e);
@ -395,7 +395,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
public void flush(ChannelHandlerContext ctx) throws Exception {
// Do not encrypt the first write request if this handler is
// created with startTLS flag turned on.
if (startTls && !sentFirstMessage) {
@ -405,29 +405,21 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
if (pendingWrite == null) {
break;
}
ctx.write(pendingWrite.buf);
assert pendingWrite.promise == null;
ctx.write(pendingWrite.buf, pendingWrite.promise);
}
ctx.flush(promise);
ctx.flush();
return;
}
if (pendingUnencryptedWrites.isEmpty()) {
pendingUnencryptedWrites.add(new PendingWrite(Unpooled.EMPTY_BUFFER, promise));
} else {
PendingWrite write = pendingUnencryptedWrites.peekLast();
if (write.promise == null) {
write.promise = promise;
} else {
write.promise.addListener(new ChannelPromiseNotifier(promise));
}
pendingUnencryptedWrites.add(new PendingWrite(Unpooled.EMPTY_BUFFER, null));
}
flush0(ctx);
}
@Override
public void write(final ChannelHandlerContext ctx, Object msg)
public void write(final ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
throws Exception {
pendingUnencryptedWrites.add(new PendingWrite((ByteBuf) msg));
pendingUnencryptedWrites.add(new PendingWrite((ByteBuf) msg, promise));
}
private void flush0(ChannelHandlerContext ctx) throws SSLException {
@ -472,13 +464,11 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
} else {
switch (result.getHandshakeStatus()) {
case NEED_WRAP:
ctx.write(out);
if (promise != null) {
ctx.flush(promise);
ctx.writeAndFlush(out, promise);
promise = null;
} else {
ctx.flush();
ctx.writeAndFlush(out);
}
out = ctx.alloc().buffer();
continue;
@ -518,12 +508,10 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
throw e;
} finally {
if (out != null && out.isReadable()) {
ctx.write(out);
if (promise != null) {
ctx.flush(promise);
ctx.writeAndFlush(out, promise);
} else {
ctx.flush();
ctx.writeAndFlush(out);
}
out = null;
} else if (promise != null) {
@ -1003,7 +991,8 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
engine.closeOutbound();
ChannelPromise closeNotifyFuture = ctx.newPromise().addListener(closeNotifyWriteListener);
flush(ctx, closeNotifyFuture);
write(ctx, Unpooled.EMPTY_BUFFER, closeNotifyFuture);
flush(ctx);
safeClose(ctx, closeNotifyFuture, promise);
}
@ -1140,7 +1129,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
private static final class PendingWrite {
final ByteBuf buf;
ChannelPromise promise;
final ChannelPromise promise;
PendingWrite(ByteBuf buf, ChannelPromise promise) {
this.buf = buf;

115
handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
View File

@ -69,12 +69,11 @@ public class ChunkedWriteHandler
private static final InternalLogger logger =
InternalLoggerFactory.getInstance(ChunkedWriteHandler.class);
private final Queue<Object> queue = new ArrayDeque<Object>();
private final Queue<PendingWrite> queue = new ArrayDeque<PendingWrite>();
private final int maxPendingWrites;
private volatile ChannelHandlerContext ctx;
private final AtomicInteger pendingWrites = new AtomicInteger();
private Object currentEvent;
private PendingWrite currentWrite;
public ChunkedWriteHandler() {
this(4);
}
@ -136,13 +135,12 @@ public class ChunkedWriteHandler
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
queue.add(msg);
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
queue.add(new PendingWrite(msg, promise));
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
queue.add(promise);
public void flush(ChannelHandlerContext ctx) throws Exception {
if (isWritable() || !ctx.channel().isActive()) {
doFlush(ctx);
}
@ -155,48 +153,45 @@ public class ChunkedWriteHandler
}
private void discard(final ChannelHandlerContext ctx, Throwable cause) {
boolean fireExceptionCaught = false;
boolean success = true;
for (;;) {
Object currentEvent = this.currentEvent;
PendingWrite currentWrite = this.currentWrite;
if (this.currentEvent == null) {
currentEvent = queue.poll();
if (this.currentWrite == null) {
currentWrite = queue.poll();
} else {
this.currentEvent = null;
this.currentWrite = null;
}
if (currentEvent == null) {
if (currentWrite == null) {
break;
}
if (currentEvent instanceof ChunkedInput) {
ChunkedInput<?> in = (ChunkedInput<?>) currentEvent;
Object message = currentWrite.msg;
if (message instanceof ChunkedInput) {
ChunkedInput<?> in = (ChunkedInput<?>) message;
try {
if (!in.isEndOfInput()) {
success = false;
if (cause == null) {
cause = new ClosedChannelException();
}
currentWrite.fail(cause);
} else {
currentWrite.promise.setSuccess();
}
closeInput(in);
} catch (Exception e) {
success = false;
currentWrite.fail(e);
logger.warn(ChunkedInput.class.getSimpleName() + ".isEndOfInput() failed", e);
closeInput(in);
}
closeInput(in);
} else if (currentEvent instanceof ChannelPromise) {
ChannelPromise f = (ChannelPromise) currentEvent;
if (!success) {
fireExceptionCaught = true;
if (cause == null) {
cause = new ClosedChannelException();
}
f.setFailure(cause);
} else {
f.setSuccess();
} else {
if (cause == null) {
cause = new ClosedChannelException();
}
currentWrite.fail(cause);
}
}
if (fireExceptionCaught) {
if (cause != null) {
ctx.fireExceptionCaught(cause);
}
}
@ -207,21 +202,21 @@ public class ChunkedWriteHandler
discard(ctx, null);
return;
}
boolean needsFlush;
while (isWritable()) {
if (currentEvent == null) {
currentEvent = queue.poll();
if (currentWrite == null) {
currentWrite = queue.poll();
}
if (currentEvent == null) {
if (currentWrite == null) {
break;
}
needsFlush = true;
final PendingWrite currentWrite = this.currentWrite;
final Object pendingMessage = currentWrite.msg;
final Object currentEvent = this.currentEvent;
if (currentEvent instanceof ChannelPromise) {
this.currentEvent = null;
ctx.flush((ChannelPromise) currentEvent);
} else if (currentEvent instanceof ChunkedInput) {
final ChunkedInput<?> chunks = (ChunkedInput<?>) currentEvent;
if (pendingMessage instanceof ChunkedInput) {
final ChunkedInput<?> chunks = (ChunkedInput<?>) pendingMessage;
boolean endOfInput;
boolean suspend;
Object message = null;
@ -236,12 +231,13 @@ public class ChunkedWriteHandler
suspend = false;
}
} catch (final Throwable t) {
this.currentEvent = null;
this.currentWrite = null;
if (message != null) {
ReferenceCountUtil.release(message);
}
currentWrite.fail(t);
if (ctx.executor().inEventLoop()) {
ctx.fireExceptionCaught(t);
} else {
@ -265,9 +261,9 @@ public class ChunkedWriteHandler
}
pendingWrites.incrementAndGet();
ChannelFuture f = ctx.write(message).flush();
ChannelFuture f = ctx.write(message);
if (endOfInput) {
this.currentEvent = null;
this.currentWrite = null;
// Register a listener which will close the input once the write is complete.
// This is needed because the Chunk may have some resource bound that can not
@ -278,6 +274,7 @@ public class ChunkedWriteHandler
@Override
public void operationComplete(ChannelFuture future) throws Exception {
pendingWrites.decrementAndGet();
currentWrite.promise.setSuccess();
closeInput(chunks);
}
});
@ -287,7 +284,8 @@ public class ChunkedWriteHandler
public void operationComplete(ChannelFuture future) throws Exception {
pendingWrites.decrementAndGet();
if (!future.isSuccess()) {
closeInput((ChunkedInput<?>) currentEvent);
closeInput((ChunkedInput<?>) pendingMessage);
currentWrite.fail(future.cause());
}
}
});
@ -297,7 +295,8 @@ public class ChunkedWriteHandler
public void operationComplete(ChannelFuture future) throws Exception {
pendingWrites.decrementAndGet();
if (!future.isSuccess()) {
closeInput((ChunkedInput<?>) currentEvent);
closeInput((ChunkedInput<?>) pendingMessage);
currentWrite.fail(future.cause());
} else if (isWritable()) {
resumeTransfer();
}
@ -305,10 +304,13 @@ public class ChunkedWriteHandler
});
}
} else {
ctx.write(currentEvent);
this.currentEvent = null;
ctx.write(pendingMessage, currentWrite.promise);
this.currentWrite = null;
}
if (needsFlush) {
ctx.flush();
}
if (!channel.isActive()) {
discard(ctx, new ClosedChannelException());
return;
@ -325,4 +327,21 @@ public class ChunkedWriteHandler
}
}
}
private static final class PendingWrite {
final Object msg;
final ChannelPromise promise;
PendingWrite(Object msg, ChannelPromise promise) {
this.msg = msg;
this.promise = promise;
}
void fail(Throwable cause) {
ReferenceCountUtil.release(msg);
if (promise != null) {
promise.setFailure(cause);
}
}
}
}

4
handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java
View File

@ -254,7 +254,7 @@ public class IdleStateHandler extends ChannelDuplexHandler {
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
promise.addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
@ -262,7 +262,7 @@ public class IdleStateHandler extends ChannelDuplexHandler {
firstWriterIdleEvent = firstAllIdleEvent = true;
}
});
ctx.flush(promise);
ctx.write(msg, promise);
}
private void initialize(ChannelHandlerContext ctx) {

4
handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java
View File

@ -101,9 +101,9 @@ public class WriteTimeoutHandler extends ChannelOutboundHandlerAdapter {
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
scheduleTimeout(ctx, promise);
ctx.flush(promise);
ctx.write(msg, promise);
}
private void scheduleTimeout(final ChannelHandlerContext ctx, final ChannelPromise future) {

5
handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
View File

@ -18,6 +18,7 @@ package io.netty.handler.traffic;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPromise;
import io.netty.util.Attribute;
import io.netty.util.AttributeKey;
@ -275,7 +276,7 @@ public abstract class AbstractTrafficShapingHandler extends ChannelDuplexHandler
}
@Override
public void write(final ChannelHandlerContext ctx, final Object msg)
public void write(final ChannelHandlerContext ctx, final Object msg, ChannelPromise promise)
throws Exception {
long curtime = System.currentTimeMillis();
long size = ((ByteBuf) msg).readableBytes();
@ -301,7 +302,7 @@ public abstract class AbstractTrafficShapingHandler extends ChannelDuplexHandler
return;
}
}
ctx.write(msg);
ctx.write(msg, promise);
}
/**

4
handler/src/test/java/io/netty/handler/stream/ChunkedWriteHandlerTest.java
View File

@ -134,7 +134,7 @@ public class ChunkedWriteHandlerTest {
};
EmbeddedChannel ch = new EmbeddedChannel(new ChunkedWriteHandler());
ch.write(input).flush().addListener(listener).syncUninterruptibly();
ch.writeAndFlush(input).addListener(listener).syncUninterruptibly();
ch.checkException();
ch.finish();
@ -172,7 +172,7 @@ public class ChunkedWriteHandlerTest {
};
EmbeddedChannel ch = new EmbeddedChannel(new ChunkedWriteHandler());
ch.write(input).flush().syncUninterruptibly();
ch.writeAndFlush(input).syncUninterruptibly();
ch.checkException();
assertTrue(ch.finish());

4
testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
View File

@ -86,7 +86,7 @@ public class SctpEchoTest extends AbstractSctpTest {
for (int i = 0; i < data.length;) {
int length = Math.min(random.nextInt(1024 * 64), data.length - i);
cc.write(Unpooled.wrappedBuffer(data, i, length)).flush();
cc.writeAndFlush(Unpooled.wrappedBuffer(data, i, length));
i += length;
}
@ -159,7 +159,7 @@ public class SctpEchoTest extends AbstractSctpTest {
}
if (channel.parent() != null) {
channel.write(Unpooled.wrappedBuffer(actual)).flush();
channel.writeAndFlush(Unpooled.wrappedBuffer(actual));
}
counter += actual.length;

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramMulticastTest.java
View File

@ -73,7 +73,7 @@ public class DatagramMulticastTest extends AbstractDatagramTest {
cc.joinGroup(groupAddress, NetUtil.LOOPBACK_IF).sync();
sc.write(new DatagramPacket(Unpooled.copyInt(1), groupAddress)).flush().sync();
sc.writeAndFlush(new DatagramPacket(Unpooled.copyInt(1), groupAddress)).sync();
assertTrue(mhandler.await());
// leave the group
@ -83,7 +83,7 @@ public class DatagramMulticastTest extends AbstractDatagramTest {
Thread.sleep(1000);
// we should not receive a message anymore as we left the group before
sc.write(new DatagramPacket(Unpooled.copyInt(1), groupAddress)).flush().sync();
sc.writeAndFlush(new DatagramPacket(Unpooled.copyInt(1), groupAddress)).sync();
mhandler.await();
sc.close().awaitUninterruptibly();

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/DatagramUnicastTest.java
View File

@ -56,7 +56,7 @@ public class DatagramUnicastTest extends AbstractDatagramTest {
Channel sc = sb.bind().sync().channel();
Channel cc = cb.bind().sync().channel();
cc.write(new DatagramPacket(Unpooled.copyInt(1), addr)).flush().sync();
cc.writeAndFlush(new DatagramPacket(Unpooled.copyInt(1), addr)).sync();
assertTrue(latch.await(10, TimeUnit.SECONDS));
sc.close().sync();

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketBufReleaseTest.java
View File

@ -86,7 +86,7 @@ public class SocketBufReleaseTest extends AbstractSocketTest {
buf = ctx.alloc().buffer();
buf.writeBytes(data);
ctx.channel().write(buf).flush().addListener(new ChannelFutureListener() {
ctx.channel().writeAndFlush(buf).addListener(new ChannelFutureListener() {
@Override
public void operationComplete(ChannelFuture future) throws Exception {
latch.countDown();

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketEchoTest.java
View File

@ -132,9 +132,9 @@ public class SocketEchoTest extends AbstractSocketTest {
int length = Math.min(random.nextInt(1024 * 64), data.length - i);
ByteBuf buf = Unpooled.wrappedBuffer(data, i, length);
if (voidPromise) {
assertEquals(cc.voidPromise(), cc.write(buf).flush(cc.voidPromise()));
assertEquals(cc.voidPromise(), cc.writeAndFlush(buf, cc.voidPromise()));
} else {
assertNotEquals(cc.voidPromise(), cc.write(buf).flush());
assertNotEquals(cc.voidPromise(), cc.writeAndFlush(buf));
}
i += length;
}

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketFileRegionTest.java
View File

@ -90,9 +90,9 @@ public class SocketFileRegionTest extends AbstractSocketTest {
Channel cc = cb.connect().sync().channel();
FileRegion region = new DefaultFileRegion(new FileInputStream(file).getChannel(), 0L, file.length());
if (voidPromise) {
assertEquals(cc.voidPromise(), cc.write(region).flush(cc.voidPromise()));
assertEquals(cc.voidPromise(), cc.writeAndFlush(region, cc.voidPromise()));
} else {
assertNotEquals(cc.voidPromise(), cc.write(region).flush());
assertNotEquals(cc.voidPromise(), cc.writeAndFlush(region));
}
while (sh.counter < data.length) {
if (sh.exception.get() != null) {

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketFixedLengthEchoTest.java
View File

@ -71,7 +71,7 @@ public class SocketFixedLengthEchoTest extends AbstractSocketTest {
Channel cc = cb.connect().sync().channel();
for (int i = 0; i < data.length;) {
int length = Math.min(random.nextInt(1024 * 3), data.length - i);
cc.write(Unpooled.wrappedBuffer(data, i, length)).flush();
cc.writeAndFlush(Unpooled.wrappedBuffer(data, i, length));
i += length;
}

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketGatheringWriteTest.java
View File

@ -85,7 +85,7 @@ public class SocketGatheringWriteTest extends AbstractSocketTest {
}
i += length;
}
assertNotEquals(cc.voidPromise(), cc.flush().sync());
assertNotEquals(cc.voidPromise(), cc.writeAndFlush(Unpooled.EMPTY_BUFFER).sync());
while (sh.counter < data.length) {
if (sh.exception.get() != null) {

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketObjectEchoTest.java
View File

@ -82,7 +82,7 @@ public class SocketObjectEchoTest extends AbstractSocketTest {
Channel sc = sb.bind().sync().channel();
Channel cc = cb.connect().sync().channel();
for (String element : data) {
cc.write(element).flush();
cc.writeAndFlush(element);
}
while (ch.counter < data.length) {

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketShutdownOutputBySelfTest.java
View File

@ -48,7 +48,7 @@ public class SocketShutdownOutputBySelfTest extends AbstractClientSocketTest {
assertFalse(ch.isOutputShutdown());
s = ss.accept();
ch.write(Unpooled.wrappedBuffer(new byte[] { 1 })).flush().sync();
ch.writeAndFlush(Unpooled.wrappedBuffer(new byte[] { 1 })).sync();
assertEquals(1, s.getInputStream().read());
assertTrue(h.ch.isOpen());

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSpdyEchoTest.java
View File

@ -198,7 +198,7 @@ public class SocketSpdyEchoTest extends AbstractSocketTest {
int port = ((InetSocketAddress) sc.localAddress()).getPort();
Channel cc = cb.remoteAddress(NetUtil.LOCALHOST, port).connect().sync().channel();
cc.write(frames).flush();
cc.writeAndFlush(frames);
while (ch.counter < frames.writerIndex() - ignoredBytes) {
if (sh.exception.get() != null) {

4
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
View File

@ -101,7 +101,7 @@ public class SocketSslEchoTest extends AbstractSocketTest {
Channel sc = sb.bind().sync().channel();
Channel cc = cb.connect().sync().channel();
Future<Channel> hf = cc.pipeline().get(SslHandler.class).handshakeFuture();
cc.write(Unpooled.wrappedBuffer(data, 0, FIRST_MESSAGE_SIZE)).flush();
cc.writeAndFlush(Unpooled.wrappedBuffer(data, 0, FIRST_MESSAGE_SIZE));
final AtomicBoolean firstByteWriteFutureDone = new AtomicBoolean();
hf.sync();
@ -110,7 +110,7 @@ public class SocketSslEchoTest extends AbstractSocketTest {
for (int i = FIRST_MESSAGE_SIZE; i < data.length;) {
int length = Math.min(random.nextInt(1024 * 64), data.length - i);
ChannelFuture future = cc.write(Unpooled.wrappedBuffer(data, i, length)).flush();
ChannelFuture future = cc.writeAndFlush(Unpooled.wrappedBuffer(data, i, length));
future.sync();
i += length;
}

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketStringEchoTest.java
View File

@ -85,7 +85,7 @@ public class SocketStringEchoTest extends AbstractSocketTest {
Channel cc = cb.connect().sync().channel();
for (String element : data) {
String delimiter = random.nextBoolean() ? "\r\n" : "\n";
cc.write(element + delimiter).flush();
cc.writeAndFlush(element + delimiter);
}
while (ch.counter < data.length) {

2
testsuite/src/test/java/io/netty/testsuite/transport/socket/WriteBeforeRegisteredTest.java
View File

@ -34,7 +34,7 @@ public class WriteBeforeRegisteredTest extends AbstractClientSocketTest {
SocketChannel ch = null;
try {
ch = (SocketChannel) cb.handler(h).connect().channel();
ch.write(Unpooled.wrappedBuffer(new byte[] { 1 })).flush();
ch.writeAndFlush(Unpooled.wrappedBuffer(new byte[] { 1 }));
} finally {
if (ch != null) {
ch.close();

4
transport-udt/src/test/java/io/netty/test/udt/util/EchoByteHandler.java
View File

@ -58,7 +58,7 @@ public class EchoByteHandler extends ChannelInboundHandlerAdapter {
log.info("ECHO active {}", NioUdtProvider.socketUDT(ctx.channel()).toStringOptions());
ctx.write(message).flush();
ctx.writeAndFlush(message);
}
@Override
@ -67,7 +67,7 @@ public class EchoByteHandler extends ChannelInboundHandlerAdapter {
if (meter != null) {
meter.mark(buf.readableBytes());
}
ctx.write(msg).flush();
ctx.writeAndFlush(msg);
}
@Override

4
transport-udt/src/test/java/io/netty/test/udt/util/EchoMessageHandler.java
View File

@ -57,7 +57,7 @@ public class EchoMessageHandler extends ChannelInboundHandlerAdapter {
@Override
public void channelActive(final ChannelHandlerContext ctx) throws Exception {
log.info("ECHO active {}", NioUdtProvider.socketUDT(ctx.channel()).toStringOptions());
ctx.write(message).flush();
ctx.writeAndFlush(message);
}
@Override
@ -72,6 +72,6 @@ public class EchoMessageHandler extends ChannelInboundHandlerAdapter {
if (meter != null) {
meter.mark(udtMsg.content().readableBytes());
}
ctx.write(msg).flush();
ctx.writeAndFlush(msg);
}
}

69
transport/src/main/java/io/netty/channel/AbstractChannel.java
View File

@ -19,7 +19,6 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.ByteBufHolder;
import io.netty.util.DefaultAttributeMap;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.internal.PlatformDependent;
import io.netty.util.internal.ThreadLocalRandom;
import io.netty.util.internal.logging.InternalLogger;
@ -178,8 +177,9 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
}
@Override
public ChannelFuture flush() {
return pipeline.flush();
public Channel flush() {
pipeline.flush();
return this;
}
@Override
@ -219,14 +219,13 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
}
@Override
public Channel write(Object msg) {
pipeline.write(msg);
return this;
public ChannelFuture write(Object msg) {
return pipeline.write(msg);
}
@Override
public ChannelFuture flush(ChannelPromise promise) {
return pipeline.flush(promise);
public ChannelFuture write(Object msg, ChannelPromise promise) {
return pipeline.write(msg, promise);
}
@Override
@ -589,13 +588,13 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
}
@Override
public void write(Object msg) {
outboundBuffer.addMessage(msg);
public void write(Object msg, ChannelPromise promise) {
outboundBuffer.addMessage(msg, promise);
}
@Override
public void flush(final ChannelPromise promise) {
outboundBuffer.addPromise(promise);
public void flush() {
outboundBuffer.addFlush();
if (!inFlushNow) { // Avoid re-entrance
try {
@ -615,7 +614,7 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
eventLoop().execute(new Runnable() {
@Override
public void run() {
flush(promise);
flush();
}
});
}
@ -645,50 +644,32 @@ public abstract class AbstractChannel extends DefaultAttributeMap implements Cha
try {
for (;;) {
ChannelPromise promise = outboundBuffer.currentPromise;
if (promise == null) {
if (!outboundBuffer.next()) {
break;
}
promise = outboundBuffer.currentPromise;
}
MessageList messages = outboundBuffer.currentMessages;
// Make sure the message list is not empty.
if (messages == null) {
promise.trySuccess();
if (!outboundBuffer.next()) {
break;
} else {
continue;
}
messages = outboundBuffer.currentMessages;
}
int messageIndex = outboundBuffer.currentMessageIndex;
int messageCount = messages.size();
Object[] messageArray = messages.array();
// Make sure the promise has not been cancelled.
if (promise.isCancelled()) {
// If cancelled, release all unwritten messages and recycle.
for (int i = messageIndex; i < messageCount; i ++) {
ReferenceCountUtil.release(messageArray[i]);
}
messages.recycle();
if (!outboundBuffer.next()) {
break;
} else {
continue;
}
}
Object[] messageArray = messages.messages();
ChannelPromise[] promiseArray = messages.promises();
// Write the messages.
int writtenMessages = doWrite(messageArray, messageCount, messageIndex);
outboundBuffer.currentMessageIndex = messageIndex += writtenMessages;
final int writtenMessages = doWrite(messageArray, messageCount, messageIndex);
// Notify the promises.
final int newMessageIndex = messageIndex + writtenMessages;
for (int i = messageIndex; i < newMessageIndex; i ++) {
promiseArray[i].trySuccess();
}
// Update the index variable and decide what to do next.
outboundBuffer.currentMessageIndex = messageIndex = newMessageIndex;
if (messageIndex >= messageCount) {
messages.recycle();
promise.trySuccess();
if (!outboundBuffer.next()) {
break;
}

11
transport/src/main/java/io/netty/channel/AbstractServerChannel.java
View File

@ -25,8 +25,8 @@ import java.net.SocketAddress;
* <ul>
* <li>{@link #connect(SocketAddress, ChannelPromise)}</li>
* <li>{@link #disconnect(ChannelPromise)}</li>
* <li>{@link #write(Object)}</li>
* <li>{@link #flush(ChannelPromise)}</li>
* <li>{@link #write(Object, ChannelPromise)}</li>
* <li>{@link #flush()}</li>
* <li>and the shortcut methods which calls the methods mentioned above
* </ul>
*/
@ -78,13 +78,14 @@ public abstract class AbstractServerChannel extends AbstractChannel implements S
private final class DefaultServerUnsafe extends AbstractUnsafe {
@Override
public void write(Object msg) {
public void write(Object msg, ChannelPromise promise) {
ReferenceCountUtil.release(msg);
reject(promise);
}
@Override
public void flush(ChannelPromise promise) {
reject(promise);
public void flush() {
// ignore
}
@Override

6
transport/src/main/java/io/netty/channel/Channel.java
View File

@ -148,7 +148,7 @@ public interface Channel extends AttributeMap, ChannelOutboundInvoker, ChannelPr
boolean isWritable();
@Override
Channel write(Object msg);
Channel flush();
@Override
Channel read();
@ -237,12 +237,12 @@ public interface Channel extends AttributeMap, ChannelOutboundInvoker, ChannelPr
/**
* Schedules a write operation.
*/
void write(Object msg);
void write(Object msg, ChannelPromise promise);
/**
* Flush out all scheduled writes.
*/
void flush(ChannelPromise promise);
void flush();
/**
* Flush out all schedules writes immediately.

8
transport/src/main/java/io/netty/channel/ChannelDuplexHandler.java
View File

@ -90,12 +90,12 @@ public class ChannelDuplexHandler extends ChannelInboundHandlerAdapter implement
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
ctx.write(msg);
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
ctx.write(msg, promise);
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
ctx.flush(promise);
public void flush(ChannelHandlerContext ctx) throws Exception {
ctx.flush();
}
}

2
transport/src/main/java/io/netty/channel/ChannelHandlerContext.java
View File

@ -185,5 +185,5 @@ public interface ChannelHandlerContext
ChannelHandlerContext fireChannelWritabilityChanged();
@Override
ChannelHandlerContext write(Object msg);
ChannelHandlerContext flush();
}

64
transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
View File

@ -31,12 +31,10 @@ final class ChannelOutboundBuffer {
private static final int MIN_INITIAL_CAPACITY = 8;
ChannelPromise currentPromise;
MessageList currentMessages;
int currentMessageIndex;
private long currentMessageListSize;
private ChannelPromise[] promises;
private MessageList[] messages;
private long[] messageListSizes;
@ -79,29 +77,28 @@ final class ChannelOutboundBuffer {
initialCapacity = MIN_INITIAL_CAPACITY;
}
promises = new ChannelPromise[initialCapacity];
messages = new MessageList[initialCapacity];
messageListSizes = new long[initialCapacity];
this.channel = channel;
}
void addMessage(Object msg) {
void addMessage(Object msg, ChannelPromise promise) {
int tail = this.tail;
MessageList msgs = messages[tail];
if (msgs == null) {
messages[tail] = msgs = MessageList.newInstance();
}
msgs.add(msg);
msgs.add(msg, promise);
int size = channel.calculateMessageSize(msg);
messageListSizes[tail] += size;
incrementPendingOutboundBytes(size);
}
void addPromise(ChannelPromise promise) {
void addFlush() {
int tail = this.tail;
promises[tail] = promise;
if ((this.tail = tail + 1 & promises.length - 1) == head) {
if ((this.tail = tail + 1 & messages.length - 1) == head) {
doubleCapacity();
}
}
@ -141,28 +138,23 @@ final class ChannelOutboundBuffer {
assert head == tail;
int p = head;
int n = promises.length;
int n = messages.length;
int r = n - p; // number of elements to the right of p
int newCapacity = n << 1;
if (newCapacity < 0) {
throw new IllegalStateException("Sorry, deque too big");
}
ChannelPromise[] a1 = new ChannelPromise[newCapacity];
System.arraycopy(promises, p, a1, 0, r);
System.arraycopy(promises, 0, a1, r, p);
promises = a1;
@SuppressWarnings("unchecked")
MessageList[] a2 = new MessageList[newCapacity];
System.arraycopy(messages, p, a2, 0, r);
System.arraycopy(messages, 0, a2, r, p);
messages = a2;
MessageList[] a1 = new MessageList[newCapacity];
System.arraycopy(messages, p, a1, 0, r);
System.arraycopy(messages, 0, a1, r, p);
messages = a1;
long[] a3 = new long[newCapacity];
System.arraycopy(messageListSizes, p, a3, 0, r);
System.arraycopy(messageListSizes, 0, a3, r, p);
messageListSizes = a3;
long[] a2 = new long[newCapacity];
System.arraycopy(messageListSizes, p, a2, 0, r);
System.arraycopy(messageListSizes, 0, a2, r, p);
messageListSizes = a2;
head = 0;
tail = n;
@ -175,24 +167,21 @@ final class ChannelOutboundBuffer {
int h = head;
ChannelPromise e = promises[h]; // Element is null if deque empty
MessageList e = messages[h]; // Element is null if deque empty
if (e == null) {
currentMessageListSize = 0;
currentPromise = null;
currentMessages = null;
return false;
}
currentPromise = e;
currentMessages = messages[h];
currentMessageIndex = 0;
currentMessageListSize = messageListSizes[h];
promises[h] = null;
messages[h] = null;
messageListSizes[h] = 0;
head = h + 1 & promises.length - 1;
head = h + 1 & messages.length - 1;
return true;
}
@ -201,7 +190,7 @@ final class ChannelOutboundBuffer {
}
int size() {
return tail - head & promises.length - 1;
return tail - head & messages.length - 1;
}
boolean isEmpty() {
@ -213,10 +202,9 @@ final class ChannelOutboundBuffer {
int tail = this.tail;
if (head != tail) {
this.head = this.tail = 0;
final int mask = promises.length - 1;
final int mask = messages.length - 1;
int i = head;
do {
promises[i] = null;
messages[i] = null;
messageListSizes[i] = 0;
i = i + 1 & mask;
@ -236,25 +224,25 @@ final class ChannelOutboundBuffer {
try {
inFail = true;
if (currentPromise == null) {
if (currentMessages == null) {
if (!next()) {
return;
}
}
do {
if (!(currentPromise instanceof VoidChannelPromise) && !currentPromise.tryFailure(cause)) {
logger.warn("Promise done already: {} - new exception is:", currentPromise, cause);
}
if (currentMessages != null) {
// Release all failed messages.
Object[] array = currentMessages.array();
Object[] messages = currentMessages.messages();
ChannelPromise[] promises = currentMessages.promises();
final int size = currentMessages.size();
try {
for (int i = currentMessageIndex; i < size; i++) {
Object msg = array[i];
ReferenceCountUtil.release(msg);
ReferenceCountUtil.release(messages[i]);
ChannelPromise p = promises[i];
if (!(p instanceof VoidChannelPromise) && !p.tryFailure(cause)) {
logger.warn("Promise done already: {} - new exception is:", p, cause);
}
}
} finally {
currentMessages.recycle();

9
transport/src/main/java/io/netty/channel/ChannelOutboundHandler.java
View File

@ -76,12 +76,7 @@ public interface ChannelOutboundHandler extends ChannelHandler {
*/
void read(ChannelHandlerContext ctx) throws Exception;
/**
* Called once a flush operation is made and so the outbound data should be written.
*
* @param ctx the {@link ChannelHandlerContext} for which the flush operation is made
*/
void write(ChannelHandlerContext ctx, Object msg) throws Exception;
void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception;
void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception;
void flush(ChannelHandlerContext ctx) throws Exception;
}

14
transport/src/main/java/io/netty/channel/ChannelOutboundHandlerAdapter.java
View File

@ -100,12 +100,18 @@ public class ChannelOutboundHandlerAdapter extends ChannelHandlerAdapter impleme
* Sub-classes may override this method to change behavior.
*/
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
ctx.write(msg);
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
ctx.write(msg, promise);
}
/**
* Calls {@link ChannelHandlerContext#flush()} to forward
* to the next {@link ChannelOutboundHandler} in the {@link ChannelPipeline}.
*
* Sub-classes may override this method to change behavior.
*/
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
ctx.flush(promise);
public void flush(ChannelHandlerContext ctx) throws Exception {
ctx.flush();
}
}

22
transport/src/main/java/io/netty/channel/ChannelOutboundInvoker.java
View File

@ -99,8 +99,6 @@ interface ChannelOutboundInvoker {
*/
ChannelFuture deregister();
ChannelFuture flush();
/**
* Request to bind to the given {@link SocketAddress} and notify the {@link ChannelFuture} once the operation
* completes, either because the operation was successful or because of an error.
@ -204,19 +202,25 @@ interface ChannelOutboundInvoker {
/**
* Request to write a message via this ChannelOutboundInvoker through the {@link ChannelPipeline}.
* This method will not request to actual flush, so be sure to call {@link #flush()} or
* {@link #flush(ChannelPromise)} once you want to request to flush all pending data to the actual transport.
* This method will not request to actual flush, so be sure to call {@link #flush()}
* once you want to request to flush all pending data to the actual transport.
*/
ChannelOutboundInvoker write(Object msg);
ChannelFuture write(Object msg);
/**
* Request to flush all pending messages via this ChannelOutboundInvoker and notify the {@link ChannelFuture}
* once the operation completes, either because the operation was successful or because of an error.
* Request to write a message via this ChannelOutboundInvoker through the {@link ChannelPipeline}.
* This method will not request to actual flush, so be sure to call {@link #flush()}
* once you want to request to flush all pending data to the actual transport.
*/
ChannelFuture flush(ChannelPromise promise);
ChannelFuture write(Object msg, ChannelPromise promise);
/**
* Shortcut for call {@link #write(Object)} and {@link #flush(ChannelPromise)}.
* Request to flush all pending messages via this ChannelOutboundInvoker.
*/
ChannelOutboundInvoker flush();
/**
* Shortcut for call {@link #write(Object, ChannelPromise)} and {@link #flush()}.
*/
ChannelFuture writeAndFlush(Object msg, ChannelPromise promise);

6
transport/src/main/java/io/netty/channel/ChannelPipeline.java
View File

@ -145,8 +145,8 @@ import java.util.NoSuchElementException;
* <ul>
* <li>{@link ChannelHandlerContext#bind(SocketAddress, ChannelPromise)}</li>
* <li>{@link ChannelHandlerContext#connect(SocketAddress, SocketAddress, ChannelPromise)}</li>
* <li>{@link ChannelHandlerContext#write(Object)}</li>
* <li>{@link ChannelHandlerContext#flush(ChannelPromise)}</li>
* <li>{@link ChannelHandlerContext#write(Object, ChannelPromise)}</li>
* <li>{@link ChannelHandlerContext#flush()}</li>
* <li>{@link ChannelHandlerContext#read()}</li>
* <li>{@link ChannelHandlerContext#disconnect(ChannelPromise)}</li>
* <li>{@link ChannelHandlerContext#close(ChannelPromise)}</li>
@ -622,7 +622,7 @@ public interface ChannelPipeline
ChannelPipeline fireChannelWritabilityChanged();
@Override
ChannelPipeline write(Object msg);
ChannelPipeline flush();
@Override
ChannelPipeline read();

8
transport/src/main/java/io/netty/channel/CombinedChannelDuplexHandler.java
View File

@ -189,13 +189,13 @@ public class CombinedChannelDuplexHandler<I extends ChannelInboundHandler, O ext
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
outboundHandler.write(ctx, msg);
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
outboundHandler.write(ctx, msg, promise);
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
outboundHandler.flush(ctx, promise);
public void flush(ChannelHandlerContext ctx) throws Exception {
outboundHandler.flush(ctx);
}
@Override

109
transport/src/main/java/io/netty/channel/DefaultChannelHandlerContext.java
View File

@ -19,7 +19,6 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.util.DefaultAttributeMap;
import io.netty.util.concurrent.EventExecutor;
import io.netty.util.concurrent.EventExecutorGroup;
import io.netty.util.internal.StringUtil;
import java.net.SocketAddress;
@ -34,7 +33,6 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
private final DefaultChannelPipeline pipeline;
private final String name;
private final ChannelHandler handler;
private Throwable lastWriteException;
private boolean removed;
// Will be set to null if no child executor should be used, otherwise it will be set to the
@ -464,11 +462,6 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
return deregister(newPromise());
}
@Override
public ChannelFuture flush() {
return flush(newPromise());
}
@Override
public ChannelFuture bind(SocketAddress localAddress, ChannelPromise promise) {
if (localAddress == null) {
@ -670,91 +663,81 @@ final class DefaultChannelHandlerContext extends DefaultAttributeMap implements
}
@Override
public ChannelHandlerContext write(Object msg) {
if (msg == null) {
throw new NullPointerException("msg");
}
findContextOutbound().invokeWrite(msg);
return this;
}
private void invokeWrite(final Object msg) {
EventExecutor executor = executor();
if (executor.inEventLoop()) {
invokeWrite0(msg);
} else {
executor.execute(new Runnable() {
@Override
public void run() {
invokeWrite0(msg);
}
});
}
}
private void invokeWrite0(Object msg) {
ChannelOutboundHandler handler = (ChannelOutboundHandler) handler();
try {
handler.write(this, msg);
} catch (Throwable t) {
if (lastWriteException == null) {
lastWriteException = t;
} else if (logger.isWarnEnabled()) {
logger.warn(
"More than one exception was raised by " + StringUtil.simpleClassName(handler) + ".write()." +
"Will fail the subsequent flush() with the first one and log others.", t);
}
}
public ChannelFuture write(Object msg) {
return write(msg, newPromise());
}
@Override
public ChannelFuture flush(ChannelPromise promise) {
public ChannelFuture write(Object msg, ChannelPromise promise) {
if (msg == null) {
throw new NullPointerException("msg");
}
validatePromise(promise, true);
return findContextOutbound().invokeFlush(promise);
findContextOutbound().invokeWrite(msg, promise);
return promise;
}
private ChannelFuture invokeFlush(final ChannelPromise promise) {
private void invokeWrite(final Object msg, final ChannelPromise promise) {
EventExecutor executor = executor();
if (executor.inEventLoop()) {
invokeFlush0(promise);
invokeWrite0(msg, promise);
} else {
executor.execute(new Runnable() {
@Override
public void run() {
invokeFlush0(promise);
invokeWrite0(msg, promise);
}
});
}
return promise;
}
private void invokeFlush0(ChannelPromise promise) {
Throwable lastWriteException = this.lastWriteException;
if (lastWriteException != null) {
this.lastWriteException = null;
promise.setFailure(lastWriteException);
return;
}
private void invokeWrite0(Object msg, ChannelPromise promise) {
ChannelOutboundHandler handler = (ChannelOutboundHandler) handler();
try {
((ChannelOutboundHandler) handler()).flush(this, promise);
handler.write(this, msg, promise);
} catch (Throwable t) {
notifyOutboundHandlerException(t, promise);
}
}
@Override
public ChannelHandlerContext flush() {
findContextOutbound().invokeFlush();
return this;
}
private void invokeFlush() {
EventExecutor executor = executor();
if (executor.inEventLoop()) {
invokeFlush0();
} else {
executor.execute(new Runnable() {
@Override
public void run() {
invokeFlush0();
}
});
}
}
private void invokeFlush0() {
try {
((ChannelOutboundHandler) handler()).flush(this);
} catch (Throwable t) {
notifyHandlerException(t);
}
}
@Override
public ChannelFuture writeAndFlush(Object msg, ChannelPromise promise) {
write(msg);
return flush(promise);
ChannelFuture future = write(msg, promise);
flush();
return future;
}
@Override
public ChannelFuture writeAndFlush(Object msg) {
write(msg);
return flush();
return writeAndFlush(msg, newPromise());
}
private static void notifyOutboundHandlerException(Throwable cause, ChannelPromise promise) {

22
transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
View File

@ -827,8 +827,9 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelFuture flush() {
return tail.flush();
public ChannelPipeline flush() {
tail.flush();
return this;
}
@Override
@ -868,14 +869,13 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public ChannelPipeline write(Object msg) {
tail.write(msg);
return this;
public ChannelFuture write(Object msg) {
return tail.write(msg);
}
@Override
public ChannelFuture flush(ChannelPromise promise) {
return tail.flush(promise);
public ChannelFuture write(Object msg, ChannelPromise promise) {
return tail.write(msg, promise);
}
@Override
@ -1024,13 +1024,13 @@ final class DefaultChannelPipeline implements ChannelPipeline {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
unsafe.write(msg);
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
unsafe.write(msg, promise);
}
@Override
public void flush(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
unsafe.flush(promise);
public void flush(ChannelHandlerContext ctx) throws Exception {
unsafe.flush();
}
@Override

40
transport/src/main/java/io/netty/channel/MessageList.java
View File

@ -45,7 +45,8 @@ final class MessageList {
}
private final Handle handle;
private Object[] elements;
private Object[] messages;
private ChannelPromise[] promises;
private int size;
MessageList(Handle handle) {
@ -55,7 +56,8 @@ final class MessageList {
MessageList(Handle handle, int initialCapacity) {
this.handle = handle;
initialCapacity = normalizeCapacity(initialCapacity);
elements = new Object[initialCapacity];
messages = new Object[initialCapacity];
promises = new ChannelPromise[initialCapacity];
}
/**
@ -75,14 +77,12 @@ final class MessageList {
/**
* Add the message to this {@link MessageList} and return itself.
*/
MessageList add(Object value) {
if (value == null) {
throw new NullPointerException("value");
}
MessageList add(Object message, ChannelPromise promise) {
int oldSize = size;
int newSize = oldSize + 1;
ensureCapacity(newSize);
elements[oldSize] = value;
messages[oldSize] = message;
promises[oldSize] = promise;
size = newSize;
return this;
}
@ -90,27 +90,39 @@ final class MessageList {
/**
* Returns the backing array of this list.
*/
Object[] array() {
return elements;
Object[] messages() {
return messages;
}
ChannelPromise[] promises() {
return promises;
}
/**
* Clear and recycle this instance.
*/
boolean recycle() {
Arrays.fill(elements, 0, size, null);
Arrays.fill(messages, 0, size, null);
Arrays.fill(promises, 0, size, null);
size = 0;
return RECYCLER.recycle(this, handle);
}
private void ensureCapacity(int capacity) {
if (elements.length >= capacity) {
if (messages.length >= capacity) {
return;
}
Object[] newElements = new Object[normalizeCapacity(capacity)];
System.arraycopy(elements, 0, newElements, 0, size);
elements = newElements;
final int size = this.size;
capacity = normalizeCapacity(capacity);
Object[] newMessages = new Object[capacity];
System.arraycopy(messages, 0, newMessages, 0, size);
messages = newMessages;
ChannelPromise[] newPromises = new ChannelPromise[capacity];
System.arraycopy(promises, 0, newPromises, 0, size);
promises = newPromises;
}
private static int normalizeCapacity(int initialCapacity) {

36
transport/src/main/java/io/netty/channel/embedded/EmbeddedChannel.java
View File

@ -28,6 +28,7 @@ import io.netty.channel.ChannelPromise;
import io.netty.channel.DefaultChannelConfig;
import io.netty.channel.EventLoop;
import io.netty.util.internal.PlatformDependent;
import io.netty.util.internal.RecyclableArrayList;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
@ -167,20 +168,31 @@ public class EmbeddedChannel extends AbstractChannel {
return !lastOutboundBuffer.isEmpty();
}
for (Object m: msgs) {
if (m == null) {
break;
RecyclableArrayList futures = RecyclableArrayList.newInstance(msgs.length);
try {
for (Object m: msgs) {
if (m == null) {
break;
}
futures.add(write(m));
}
write(m);
flush();
for (int i = 0; i < futures.size(); i++) {
ChannelFuture future = (ChannelFuture) futures.get(i);
assert future.isDone();
if (future.cause() != null) {
recordException(future.cause());
}
}
runPendingTasks();
checkException();
return !lastOutboundBuffer.isEmpty();
} finally {
futures.recycle();
}
ChannelFuture future = flush();
assert future.isDone();
if (future.cause() != null) {
recordException(future.cause());
}
runPendingTasks();
checkException();
return !lastOutboundBuffer.isEmpty();
}
/**

4
transport/src/main/java/io/netty/channel/group/ChannelGroup.java
View File

@ -105,7 +105,7 @@ public interface ChannelGroup extends Set<Channel>, Comparable<ChannelGroup> {
*
* @return itself
*/
ChannelGroup write(Object message);
ChannelGroupFuture write(Object message);
/**
* Flush all {@link Channel}s in this
@ -115,7 +115,7 @@ public interface ChannelGroup extends Set<Channel>, Comparable<ChannelGroup> {
* @return the {@link ChannelGroupFuture} instance that notifies when
* the operation is done for all channels
*/
ChannelGroupFuture flush();
ChannelGroup flush();
/**
* Shortcut for calling {@link #write(Object)} and {@link #flush()}.

16
transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
View File

@ -192,27 +192,27 @@ public class DefaultChannelGroup extends AbstractSet<Channel> implements Channel
}
@Override
public ChannelGroup write(Object message) {
public ChannelGroupFuture write(Object message) {
if (message == null) {
throw new NullPointerException("message");
}
Map<Channel, ChannelFuture> futures = new LinkedHashMap<Channel, ChannelFuture>(size());
for (Channel c: nonServerChannels) {
c.write(safeDuplicate(message));
futures.put(c, c.write(safeDuplicate(message)));
}
ReferenceCountUtil.release(message);
return this;
return new DefaultChannelGroupFuture(this, futures, executor);
}
@Override
public ChannelGroupFuture flush() {
Map<Channel, ChannelFuture> futures = new LinkedHashMap<Channel, ChannelFuture>(size());
public ChannelGroup flush() {
for (Channel c: nonServerChannels) {
futures.put(c, c.flush());
c.flush();
}
return new DefaultChannelGroupFuture(this, futures, executor);
return this;
}
@Override

4
transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
View File

@ -137,7 +137,7 @@ public class DefaultChannelPipelineTest {
StringInboundHandler handler = new StringInboundHandler();
setUp(handler);
peer.write(holder).flush().sync();
peer.writeAndFlush(holder).sync();
assertTrue(free.await(10, TimeUnit.SECONDS));
assertTrue(handler.called);
@ -488,7 +488,7 @@ public class DefaultChannelPipelineTest {
final Queue<Object> outboundBuffer = new ArrayDeque<Object>();
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
outboundBuffer.add(msg);
}

2
transport/src/test/java/io/netty/channel/local/LocalChannelTest.java
View File

@ -124,7 +124,7 @@ public class LocalChannelTest {
// Close the channel and write something.
cc.close().sync();
try {
cc.write(new Object()).flush().sync();
cc.writeAndFlush(new Object()).sync();
fail("must raise a ClosedChannelException");
} catch (Exception e) {
assertThat(e, is(instanceOf(ClosedChannelException.class)));

23
transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
View File

@ -17,11 +17,13 @@ package io.netty.channel.local;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPromise;
import io.netty.channel.EventLoopGroup;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.concurrent.DefaultEventExecutorGroup;
@ -108,7 +110,7 @@ public class LocalTransportThreadModelTest {
ch.pipeline().write("5");
ch.pipeline().context(h3).write("6");
ch.pipeline().context(h2).write("7");
ch.pipeline().context(h1).write("8").flush().sync();
ch.pipeline().context(h1).writeAndFlush("8").sync();
ch.close().sync();
@ -371,9 +373,9 @@ public class LocalTransportThreadModelTest {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
outboundThreadNames.add(Thread.currentThread().getName());
ctx.write(msg);
ctx.write(msg, promise);
}
@Override
@ -414,7 +416,7 @@ public class LocalTransportThreadModelTest {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
Assert.assertSame(t, Thread.currentThread());
// Don't let the write request go to the server-side channel - just swallow.
@ -430,6 +432,7 @@ public class LocalTransportThreadModelTest {
ctx.write(actual);
}
}
ctx.writeAndFlush(Unpooled.EMPTY_BUFFER, promise);
m.release();
}
@ -473,7 +476,7 @@ public class LocalTransportThreadModelTest {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
Assert.assertSame(t, Thread.currentThread());
ByteBuf out = ctx.alloc().buffer(4);
@ -482,7 +485,7 @@ public class LocalTransportThreadModelTest {
Assert.assertEquals(expected, m);
out.writeInt(m);
ctx.write(out);
ctx.write(out, promise);
}
@Override
@ -521,14 +524,14 @@ public class LocalTransportThreadModelTest {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
Assert.assertSame(t, Thread.currentThread());
int actual = (Integer) msg;
int expected = outCnt ++;
Assert.assertEquals(expected, actual);
ctx.write(msg);
ctx.write(msg, promise);
}
@Override
@ -566,13 +569,13 @@ public class LocalTransportThreadModelTest {
@Override
public void write(
ChannelHandlerContext ctx, Object msg) throws Exception {
ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
Assert.assertSame(t, Thread.currentThread());
int actual = (Integer) msg;
int expected = outCnt ++;
Assert.assertEquals(expected, actual);
ctx.write(msg);
ctx.write(msg, promise);
}
@Override

4
transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest2.java
View File

@ -107,9 +107,9 @@ public class LocalTransportThreadModelTest2 {
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
for (int i = 0; i < messageCountPerRun; i ++) {
ctx.channel().write(name + ' ' + i);
lastWriteFuture = ctx.channel().write(name + ' ' + i);
}
lastWriteFuture = ctx.channel().flush();
ctx.channel().flush();
}
@Override

4
transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest3.java
View File

@ -22,6 +22,7 @@ import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.ChannelPromise;
import io.netty.channel.EventLoopGroup;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.concurrent.DefaultEventExecutorGroup;
@ -309,10 +310,11 @@ public class LocalTransportThreadModelTest3 {
}
@Override
public void write(ChannelHandlerContext ctx, Object msg) throws Exception {
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
if (!inbound) {
events.add(EventType.WRITE);
}
promise.setSuccess();
}
@Override