优化client

src/main/java/org/redkale/net/AsyncNioConnection.java

@@ -397,9 +397,9 @@ abstract class AsyncNioConnection extends AsyncConnection {
 
                     if (writeCount == 0) {
                         if (hasRemain) {
-                            //writeCompleted = false;
-                            //writeTotal = totalCount;
-                            continue;  //要全部输出完才返回
+                            writeCompleted = false;
+                            writeTotal = totalCount;
+                            //continue;  //要全部输出完才返回
                         }
                         break;
                     } else if (writeCount < 0) {

src/main/java/org/redkale/net/client/ClientConnection.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
-import java.util.*;
+import java.util.Iterator;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.ReentrantLock;
@@ -45,6 +45,8 @@ public abstract class ClientConnection<R extends ClientRequest, P> implements Co
 
     protected final LongAdder doneResponseCounter = new LongAdder();
 
+    protected final AtomicBoolean writePending = new AtomicBoolean();
+
     protected final ReentrantLock writeLock = new ReentrantLock();
 
     protected final ByteArray writeArray = new ByteArray();
@@ -77,10 +79,10 @@ public abstract class ClientConnection<R extends ClientRequest, P> implements Co
     private final ClientCodec<R, P> codec;
 
     //respFutureQueue、respFutureMap二选一， SPSC队列模式
-    private final Deque<ClientFuture<R, P>> respFutureQueue = new ConcurrentLinkedDeque<>(); //Utility.unsafe() != null ? new MpscGrowableArrayQueue<>(16, 1 << 16) : new ConcurrentLinkedQueue<>();
+    private final ConcurrentLinkedDeque<ClientFuture<R, P>> respFutureQueue = new ConcurrentLinkedDeque<>(); //Utility.unsafe() != null ? new MpscGrowableArrayQueue<>(16, 1 << 16) : new ConcurrentLinkedQueue<>();
 
     //respFutureQueue、respFutureMap二选一, key: requestid， SPSC模式
-    private final Map<Serializable, ClientFuture<R, P>> respFutureMap = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<Serializable, ClientFuture<R, P>> respFutureMap = new ConcurrentHashMap<>();
 
     Iterator<ClientFuture<R, P>> currRespIterator; //必须在调用decodeMessages之前重置为null
 

src/main/java/org/redkale/net/client/ClientFuture.java

@@ -73,7 +73,7 @@ public class ClientFuture<R extends ClientRequest, T> extends CompletableFuture<
 
     private void runTimeout() {
         conn.removeRespFuture(request.getRequestid(), this);
-        TimeoutException ex = new TimeoutException();
+        TimeoutException ex = new TimeoutException("client-request: " + request);
         WorkThread workThread = null;
         if (request != null) {
             workThread = request.workThread;

src/main/java/org/redkale/net/http/WebSocketFuture.java

@@ -49,7 +49,7 @@ public class WebSocketFuture extends CompletableFuture<Integer> implements Runna
 
     @Override
     public void run() {
-        TimeoutException ex = new TimeoutException();
+        TimeoutException ex = new TimeoutException("packets: " + Arrays.toString(packets));
         workThread.runWork(() -> completeExceptionally(ex));
     }
 

src/main/java/org/redkale/net/http/WebSocketWriteHandler.java

@@ -31,7 +31,7 @@ public class WebSocketWriteHandler implements CompletionHandler<Integer, Void> {
 
     protected final List<WebSocketFuture<Integer>> respList = new ArrayList();
 
-    protected final ConcurrentLinkedDeque<WebSocketFuture<Integer>> requestQueue = new ConcurrentLinkedDeque();
+    protected final ConcurrentLinkedQueue<WebSocketFuture<Integer>> requestQueue = new ConcurrentLinkedQueue();
 
     public WebSocketWriteHandler(HttpContext context, WebSocket webSocket, ObjectPool<ByteArray> byteArrayPool) {
         this.context = context;