From a492cbd815aba9761c67e62d9e6ca5dbda49a4b2 Mon Sep 17 00:00:00 2001 From: Redkale Date: Fri, 27 Jan 2023 15:59:09 +0800 Subject: [PATCH] =?UTF-8?q?net=E6=B5=BC=E6=A8=BA=E5=AF=B2=E7=92=81?= =?UTF-8?q?=E2=84=83=E6=9A=9F=E9=8D=A3=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/redkale/net/AsyncConnection.java | 24 +++++++++---------- .../java/org/redkale/net/AsyncIOThread.java | 8 ------- .../net/AsyncNioCompletionHandler.java | 12 +++++----- .../redkale/net/AsyncNioTcpConnection.java | 4 +--- src/main/java/org/redkale/net/Response.java | 2 +- 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/redkale/net/AsyncConnection.java b/src/main/java/org/redkale/net/AsyncConnection.java index 01de1bb25..0f746f958 100644 --- a/src/main/java/org/redkale/net/AsyncConnection.java +++ b/src/main/java/org/redkale/net/AsyncConnection.java @@ -369,13 +369,13 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl CompletionHandler newHandler = new CompletionHandler() { @Override public void completed(Integer result, Object attachment) { - offerWriteBuffer(buffers); + offerWriteBuffers(buffers); handler.completed(result, attachment); } @Override public void failed(Throwable exc, Object attachment) { - offerWriteBuffer(buffers); + offerWriteBuffers(buffers); handler.failed(exc, attachment); } }; @@ -476,13 +476,13 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl CompletionHandler newHandler = new CompletionHandler() { @Override public void completed(Integer result, A attachment) { - offerWriteBuffer(srcs); + offerWriteBuffers(srcs); handler.completed(result, attachment); } @Override public void failed(Throwable exc, A attachment) { - offerWriteBuffer(srcs); + offerWriteBuffers(srcs); handler.failed(exc, attachment); } }; @@ -689,7 +689,7 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl readBufferConsumer.accept(buffer); } - public void offerReadBuffer(ByteBuffer... buffers) { + public void offerReadBuffers(ByteBuffer... buffers) { if (buffers == null) { return; } @@ -706,7 +706,7 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl writeBufferConsumer.accept(buffer); } - public void offerWriteBuffer(ByteBuffer... buffers) { + public void offerWriteBuffers(ByteBuffer... buffers) { if (buffers == null) { return; } @@ -1009,20 +1009,20 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl writeImpl(netBuffers, 0, netBuffers.length, null, new CompletionHandler() { @Override public void completed(Integer count, Void attachment) { - offerWriteBuffer(netBuffers); + offerWriteBuffers(netBuffers); callback.accept(null); } @Override public void failed(Throwable t, Void attachment) { - offerWriteBuffer(netBuffers); + offerWriteBuffers(netBuffers); callback.accept(t); } }); } return true; } else { - offerWriteBuffer(netBuffers); + offerWriteBuffers(netBuffers); return false; } } @@ -1048,20 +1048,20 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl writeImpl(netBuffers, 0, netBuffers.length, null, new CompletionHandler() { @Override public void completed(Integer count, Void attachment) { - offerWriteBuffer(netBuffers); + offerWriteBuffers(netBuffers); callback.accept(null); } @Override public void failed(Throwable t, Void attachment) { - offerWriteBuffer(netBuffers); + offerWriteBuffers(netBuffers); callback.accept(t); } }); } return true; } else { - offerWriteBuffer(netBuffers); + offerWriteBuffers(netBuffers); return false; } } diff --git a/src/main/java/org/redkale/net/AsyncIOThread.java b/src/main/java/org/redkale/net/AsyncIOThread.java index ed9b2b760..db654e9ab 100644 --- a/src/main/java/org/redkale/net/AsyncIOThread.java +++ b/src/main/java/org/redkale/net/AsyncIOThread.java @@ -10,7 +10,6 @@ import java.nio.ByteBuffer; import java.nio.channels.*; import java.util.*; import java.util.concurrent.*; -import java.util.concurrent.atomic.LongAdder; import java.util.function.*; import java.util.logging.*; import org.redkale.util.*; @@ -31,9 +30,6 @@ public class AsyncIOThread extends WorkThread { final Selector selector; - //如果有read/write两IOThread，只记readThread - final LongAdder connCounter = new LongAdder(); - private final Supplier bufferSupplier; private final Consumer bufferConsumer; @@ -141,10 +137,6 @@ public class AsyncIOThread extends WorkThread { return bufferConsumer; } - public int currConnections() { - return connCounter.intValue(); - } - @Override public void run() { final Queue commands = this.commandQueue; diff --git a/src/main/java/org/redkale/net/AsyncNioCompletionHandler.java b/src/main/java/org/redkale/net/AsyncNioCompletionHandler.java index 182496f31..9c6004e6d 100644 --- a/src/main/java/org/redkale/net/AsyncNioCompletionHandler.java +++ b/src/main/java/org/redkale/net/AsyncNioCompletionHandler.java @@ -74,9 +74,9 @@ class AsyncNioCompletionHandler implements CompletionHandler, Run if (conn != null) { if (buffers != null) { if (readMode) { - conn.offerReadBuffer(buffers); + conn.offerReadBuffers(buffers); } else { - conn.offerWriteBuffer(buffers); + conn.offerWriteBuffers(buffers); } } else if (buffer != null) { if (readMode) { @@ -102,9 +102,9 @@ class AsyncNioCompletionHandler implements CompletionHandler, Run if (conn != null) { if (buffers != null) { if (readMode) { - conn.offerReadBuffer(buffers); + conn.offerReadBuffers(buffers); } else { - conn.offerWriteBuffer(buffers); + conn.offerWriteBuffers(buffers); } } else if (buffer != null) { if (readMode) { @@ -125,9 +125,9 @@ class AsyncNioCompletionHandler implements CompletionHandler, Run if (conn != null) { if (buffers != null) { if (readMode) { - conn.offerReadBuffer(buffers); + conn.offerReadBuffers(buffers); } else { - conn.offerWriteBuffer(buffers); + conn.offerWriteBuffers(buffers); } } else if (buffer != null) { if (readMode) { diff --git a/src/main/java/org/redkale/net/AsyncNioTcpConnection.java b/src/main/java/org/redkale/net/AsyncNioTcpConnection.java index 7d9e69312..555c99276 100644 --- a/src/main/java/org/redkale/net/AsyncNioTcpConnection.java +++ b/src/main/java/org/redkale/net/AsyncNioTcpConnection.java @@ -39,7 +39,6 @@ class AsyncNioTcpConnection extends AsyncNioConnection { } } this.remoteAddress = addr; - ioReadThread.connCounter.increment(); } @Override @@ -183,7 +182,7 @@ class AsyncNioTcpConnection extends AsyncNioConnection { channel.write(netBuffers); } } - offerWriteBuffer(netBuffers); + offerWriteBuffers(netBuffers); return len; } @@ -269,7 +268,6 @@ class AsyncNioTcpConnection extends AsyncNioConnection { @Override public final void close() throws IOException { super.close(); - ioReadThread.connCounter.decrement(); channel.close(); if (this.connectKey != null) { this.connectKey.cancel(); diff --git a/src/main/java/org/redkale/net/Response.java b/src/main/java/org/redkale/net/Response.java index 741143997..aa9544e18 100644 --- a/src/main/java/org/redkale/net/Response.java +++ b/src/main/java/org/redkale/net/Response.java @@ -437,7 +437,7 @@ public abstract class Response> { @Override public void completed(Integer result, A attachment) { - channel.offerWriteBuffer(buffers); + channel.offerWriteBuffers(buffers); if (handler != null) { handler.completed(result, attachment); }