lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AsyncConnection写异常时需要终结

Browse Source
This commit is contained in:
redkale
2023-10-20 08:17:12 +08:00
parent 3d8dcc0026
commit ca93aceafc
1 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/main/java/org/redkale/net/AsyncNioConnection.java
View File

@@ -11,7 +11,6 @@ import java.nio.ByteBuffer;
import java.nio.channels.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
import javax.net.ssl.SSLContext;
import org.redkale.util.ByteBufferWriter;
@@ -29,8 +28,7 @@ abstract class AsyncNioConnection extends AsyncConnection {
protected SocketAddress remoteAddress;
protected final AtomicLong fastWriteCount = new AtomicLong();
//protected final AtomicLong fastWriteCount = new AtomicLong();
protected final Queue<byte[]> fastWriteQueue = new ConcurrentLinkedQueue<>();
//-------------------------------- 连操作 --------------------------------------
@@ -86,7 +84,6 @@ abstract class AsyncNioConnection extends AsyncConnection {
protected SelectionKey writeKey;
// protected CompletionHandler<Integer, Object> writeFastHandler;
public AsyncNioConnection(boolean clientMode, AsyncIOGroup ioGroup, AsyncIOThread ioReadThread,
AsyncIOThread ioWriteThread, final int bufferCapacity, SSLBuilder sslBuilder, SSLContext sslContext) {
super(clientMode, ioGroup, ioReadThread, ioWriteThread, bufferCapacity, sslBuilder, sslContext);
@@ -123,7 +120,6 @@ abstract class AsyncNioConnection extends AsyncConnection {
// this.writeFastHandler = (CompletionHandler) handler;
// return this;
// }
@Override
protected void startHandshake(final Consumer<Throwable> callback) {
ioReadThread.register(t -> super.startHandshake(callback));
@@ -337,7 +333,6 @@ abstract class AsyncNioConnection extends AsyncConnection {
// handleWrite(0, e);
// }
// }
public void doRead(boolean direct) {
try {
this.readTime = System.currentTimeMillis();
@@ -384,36 +379,37 @@ abstract class AsyncNioConnection extends AsyncConnection {
int totalCount = 0;
boolean hasRemain = true;
boolean writeCompleted = true;
if (writeByteBuffer == null && writeByteBuffers == null && writeByteTuple1Array == null && fastWriteCount.get() > 0) {
final ByteBuffer buffer = pollWriteBuffer();
ByteBufferWriter writer = null;
byte[] item;
while ((item = fastWriteQueue.poll()) != null) {
fastWriteCount.decrementAndGet();
if (writer != null) {
writer.put(item);
} else if (buffer.remaining() >= item.length) {
buffer.put(item);
} else {
writer = ByteBufferWriter.create(getWriteBufferSupplier(), buffer);
writer.put(item);
}
}
this.writeBuffersOffset = 0;
if (writer == null) {
this.writeByteBuffer = buffer.flip();
this.writeBuffersLength = 0;
} else {
this.writeByteBuffers = writer.toBuffers();
this.writeBuffersLength = this.writeByteBuffers.length;
}
this.writeByteTuple1Array = null;
this.writeByteTuple1Offset = 0;
this.writeByteTuple1Length = 0;
this.writeByteTuple2Array = null;
this.writeByteTuple2Offset = 0;
this.writeByteTuple2Length = 0;
}
boolean error = false;
// if (writeByteBuffer == null && writeByteBuffers == null && writeByteTuple1Array == null && fastWriteCount.get() > 0) {
// final ByteBuffer buffer = pollWriteBuffer();
// ByteBufferWriter writer = null;
// byte[] item;
// while ((item = fastWriteQueue.poll()) != null) {
// fastWriteCount.decrementAndGet();
// if (writer != null) {
// writer.put(item);
// } else if (buffer.remaining() >= item.length) {
// buffer.put(item);
// } else {
// writer = ByteBufferWriter.create(getWriteBufferSupplier(), buffer);
// writer.put(item);
// }
// }
// this.writeBuffersOffset = 0;
// if (writer == null) {
// this.writeByteBuffer = buffer.flip();
// this.writeBuffersLength = 0;
// } else {
// this.writeByteBuffers = writer.toBuffers();
// this.writeBuffersLength = this.writeByteBuffers.length;
// }
// this.writeByteTuple1Array = null;
// this.writeByteTuple1Offset = 0;
// this.writeByteTuple1Length = 0;
// this.writeByteTuple2Array = null;
// this.writeByteTuple2Offset = 0;
// this.writeByteTuple2Length = 0;
// }
int batchOffset = writeBuffersOffset;
int batchLength = writeBuffersLength;
@@ -485,9 +481,8 @@ abstract class AsyncNioConnection extends AsyncConnection {
}
break;
} else if (writeCount < 0) {
if (totalCount == 0) {
totalCount = writeCount;
}
error = true;
totalCount = writeCount;
break;
} else {
totalCount += writeCount;
@@ -497,11 +492,13 @@ abstract class AsyncNioConnection extends AsyncConnection {
}
}
if (writeCompleted && (totalCount != 0 || !hasRemain)) {
if (error) {
handleWrite(totalCount, new ClosedChannelException());
} else if (writeCompleted && (totalCount != 0 || !hasRemain)) {
handleWrite(this.writeTotal + totalCount, null);
if (fastWriteCount.get() > 0) {
doWrite();
}
// if (fastWriteCount.get() > 0) {
// doWrite();
// }
} else if (writeKey == null) {
ioWriteThread.register(selector -> {
try {