From 7ce7c711634832e935046f9870ba0ccf4fb64a41 Mon Sep 17 00:00:00 2001 From: Redkale Date: Fri, 6 Jan 2023 13:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/net/AsyncConnection.java | 6 ++---- .../java/org/redkale/net/AsyncNioConnection.java | 12 ++++++------ src/main/java/org/redkale/net/Request.java | 6 +++--- src/main/java/org/redkale/net/Response.java | 4 ++-- src/main/java/org/redkale/net/http/HttpRequest.java | 4 ++-- src/main/java/org/redkale/net/http/HttpResponse.java | 2 +- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/redkale/net/AsyncConnection.java b/src/main/java/org/redkale/net/AsyncConnection.java index d117481fd..3b8f451a3 100644 --- a/src/main/java/org/redkale/net/AsyncConnection.java +++ b/src/main/java/org/redkale/net/AsyncConnection.java @@ -13,8 +13,6 @@ import java.util.*; import java.util.concurrent.atomic.*; import java.util.function.*; import javax.net.ssl.SSLEngineResult.HandshakeStatus; -import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*; -import static javax.net.ssl.SSLEngineResult.Status.*; import javax.net.ssl.*; import static javax.net.ssl.SSLEngineResult.HandshakeStatus.*; import static javax.net.ssl.SSLEngineResult.Status.*; @@ -42,7 +40,7 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl private Object subobject; //用于存储绑定在Connection上的对象， 同attributes， 只绑定单个对象时尽量使用subobject而非attributes - protected final AsyncGroup ioGroup; + protected final AsyncIOGroup ioGroup; protected final boolean client; @@ -82,7 +80,7 @@ public abstract class AsyncConnection implements ChannelContext, Channel, AutoCl //用于服务端的Socket, 等同于一直存在的readCompletionHandler ProtocolCodec protocolCodec; - protected AsyncConnection(boolean client, AsyncGroup ioGroup, AsyncIOThread ioReadThread, AsyncIOThread ioWriteThread, + protected AsyncConnection(boolean client, AsyncIOGroup ioGroup, AsyncIOThread ioReadThread, AsyncIOThread ioWriteThread, final int bufferCapacity, SSLBuilder sslBuilder, SSLContext sslContext, final LongAdder livingCounter, final LongAdder closedCounter) { Objects.requireNonNull(ioGroup); Objects.requireNonNull(ioReadThread); diff --git a/src/main/java/org/redkale/net/AsyncNioConnection.java b/src/main/java/org/redkale/net/AsyncNioConnection.java index dbc303c69..6d4c4479c 100644 --- a/src/main/java/org/redkale/net/AsyncNioConnection.java +++ b/src/main/java/org/redkale/net/AsyncNioConnection.java @@ -288,7 +288,7 @@ abstract class AsyncNioConnection extends AsyncConnection { } }); } else { - ((AsyncIOGroup) ioGroup).interestOpsOr(ioReadThread, readKey, SelectionKey.OP_READ); + ioGroup.interestOpsOr(ioReadThread, readKey, SelectionKey.OP_READ); } } catch (Exception e) { handleRead(0, e); @@ -301,7 +301,7 @@ abstract class AsyncNioConnection extends AsyncConnection { final boolean invokeDirect = direct; int totalCount = 0; boolean hasRemain = true; - boolean writeOver = true; + boolean writeCompleted = true; if (invokeDirect) { currWriteInvoker++; } @@ -373,7 +373,7 @@ abstract class AsyncNioConnection extends AsyncConnection { } if (writeCount == 0) { if (hasRemain) { - writeOver = false; + writeCompleted = false; writeTotal = totalCount; } break; @@ -390,7 +390,7 @@ abstract class AsyncNioConnection extends AsyncConnection { } } - if (writeOver && (totalCount != 0 || !hasRemain)) { + if (writeCompleted && (totalCount != 0 || !hasRemain)) { handleWrite(writeTotal + totalCount, null); } else if (writeKey == null) { ioWriteThread.register(selector -> { @@ -402,7 +402,7 @@ abstract class AsyncNioConnection extends AsyncConnection { } }); } else { - ((AsyncIOGroup) ioGroup).interestOpsOr(ioWriteThread, writeKey, SelectionKey.OP_WRITE); + ioGroup.interestOpsOr(ioWriteThread, writeKey, SelectionKey.OP_WRITE); } } catch (IOException e) { handleWrite(0, e); @@ -483,7 +483,7 @@ abstract class AsyncNioConnection extends AsyncConnection { } } - @Deprecated(since = "2.5.0") + @Deprecated(since = "2.5.0") protected abstract ReadableByteChannel readableByteChannel(); @Deprecated(since = "2.5.0") diff --git a/src/main/java/org/redkale/net/Request.java b/src/main/java/org/redkale/net/Request.java index b62930536..8cfeed9e4 100644 --- a/src/main/java/org/redkale/net/Request.java +++ b/src/main/java/org/redkale/net/Request.java @@ -37,7 +37,7 @@ public abstract class Request { protected int pipelineCount; - protected boolean pipelineOver; + protected boolean pipelineCompleted; protected int hashid; @@ -67,7 +67,7 @@ public abstract class Request { this.keepAlive = request.keepAlive; this.pipelineIndex = request.pipelineIndex; this.pipelineCount = request.pipelineCount; - this.pipelineOver = request.pipelineOver; + this.pipelineCompleted = request.pipelineCompleted; this.hashid = request.hashid; this.traceid = request.traceid; this.channel = request.channel; @@ -101,7 +101,7 @@ public abstract class Request { createTime = 0; pipelineIndex = 0; pipelineCount = 0; - pipelineOver = false; + pipelineCompleted = false; keepAlive = false; attributes.clear(); channel = null; // close it by response diff --git a/src/main/java/org/redkale/net/Response.java b/src/main/java/org/redkale/net/Response.java index 188be57f9..9eb836ff3 100644 --- a/src/main/java/org/redkale/net/Response.java +++ b/src/main/java/org/redkale/net/Response.java @@ -137,7 +137,7 @@ public abstract class Response> { this.output = null; this.filter = null; this.servlet = null; - boolean notpipeline = request.pipelineIndex == 0 || request.pipelineOver; + boolean notpipeline = request.pipelineIndex == 0 || request.pipelineCompleted; request.recycle(); if (channel != null) { if (notpipeline) { @@ -224,7 +224,7 @@ public abstract class Response> { } this.recycleListener = null; } - if (request.keepAlive && (request.pipelineIndex == 0 || request.pipelineOver)) { + if (request.keepAlive && (request.pipelineIndex == 0 || request.pipelineCompleted)) { AsyncConnection conn = removeChannel(); if (conn != null && conn.protocolCodec != null) { this.responseConsumer.accept(this); diff --git a/src/main/java/org/redkale/net/http/HttpRequest.java b/src/main/java/org/redkale/net/http/HttpRequest.java index 330470d38..47d84e5de 100644 --- a/src/main/java/org/redkale/net/http/HttpRequest.java +++ b/src/main/java/org/redkale/net/http/HttpRequest.java @@ -258,8 +258,8 @@ public class HttpRequest extends Request { return maybews && "Upgrade".equalsIgnoreCase(getHeader("Connection")) && "GET".equalsIgnoreCase(method); } - protected void setPipelineOver(boolean pipelineOver) { - this.pipelineOver = pipelineOver; + protected void setPipelineCompleted(boolean pipelineCompleted) { + this.pipelineCompleted = pipelineCompleted; } protected void setKeepAlive(boolean keepAlive) { diff --git a/src/main/java/org/redkale/net/http/HttpResponse.java b/src/main/java/org/redkale/net/http/HttpResponse.java index c4f5f2e0b..d8381910e 100644 --- a/src/main/java/org/redkale/net/http/HttpResponse.java +++ b/src/main/java/org/redkale/net/http/HttpResponse.java @@ -963,7 +963,7 @@ public class HttpResponse extends Response { if (pipelineIndex > 0) { boolean over = this.channel.writePipelineData(pipelineIndex, request.getPipelineCount(), data); if (over) { - request.setPipelineOver(true); + request.setPipelineCompleted(true); this.channel.flushPipelineData(this.pipelineWriteHandler); } else { removeChannel();