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

SncpRequest优化

Browse Source
This commit is contained in:
redkale
2023-07-05 15:57:45 +08:00
parent 1b7bdd2ad9
commit 1ef6d51497
2 changed files with 142 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/org/redkale/net/sncp/SncpRequest.java
View File

@@ -39,9 +39,9 @@ public class SncpRequest extends Request<SncpContext> {
private int headerSize;
private SncpHeader header;
private ByteArray halfArray;
private int bodyOffset;
private SncpHeader header;
private boolean ping;
@@ -55,11 +55,27 @@ public class SncpRequest extends Request<SncpContext> {
protected int readHeader(ByteBuffer buffer, Request last) {
//---------------------route----------------------------------
if (this.readState == READ_STATE_ROUTE) {
if (buffer.remaining() < 2) {
return 2 - buffer.remaining(); //小于2
int remain = buffer.remaining();
int expect = halfArray == null ? 2 : 2 - halfArray.length();
if (remain < expect) {
if (remain == 1) {
if (halfArray == null) {
halfArray = new ByteArray();
}
halfArray.clear().put(buffer.get());
}
buffer.clear();
return expect - remain; //小于2
} else {
if (halfArray == null) {
this.headerSize = buffer.getChar();
} else {
halfArray.put(buffer.get());
this.headerSize = halfArray.getChar(0);
halfArray.clear();
}
}
this.headerSize = buffer.getChar();
if (headerSize < SncpHeader.HEADER_SUBSIZE) {
if (this.headerSize < SncpHeader.HEADER_SUBSIZE) {
context.getLogger().log(Level.WARNING, "sncp buffer header.length must more " + SncpHeader.HEADER_SUBSIZE + ", but " + this.headerSize);
return -1;
}
@@ -67,7 +83,23 @@ public class SncpRequest extends Request<SncpContext> {
}
//---------------------head----------------------------------
if (this.readState == READ_STATE_HEADER) {
this.header = SncpHeader.read(buffer, this.headerSize);
int remain = buffer.remaining();
int expect = halfArray == null ? this.headerSize - 2 : this.headerSize - 2 - halfArray.length();
if (remain < expect) {
if (halfArray == null) {
halfArray = new ByteArray();
}
halfArray.put(buffer);
buffer.clear();
return expect - remain;
}
if (halfArray == null || halfArray.length() == 0) {
this.header = SncpHeader.read(buffer, this.headerSize);
} else {
halfArray.put(buffer, expect);
this.header = SncpHeader.read(halfArray, this.headerSize);
halfArray.clear();
}
if (this.header.getRetcode() != 0) { // retcode
context.getLogger().log(Level.WARNING, "sncp buffer header.retcode not 0");
return -1;
@@ -76,29 +108,41 @@ public class SncpRequest extends Request<SncpContext> {
context.getLogger().log(Level.WARNING, "sncp buffer body.length must lower " + context.getMaxBody() + ", but " + this.header.getBodyLength());
return -1;
}
this.body = new byte[this.header.getBodyLength()];
this.traceid = this.header.getTraceid();
this.readState = READ_STATE_BODY;
}
//---------------------body----------------------------------
if (this.readState == READ_STATE_BODY) {
int bodyLength = this.header.getBodyLength();
if (bodyLength == 0) {
this.body = new byte[0];
this.readState = READ_STATE_END;
halfArray = null;
if (this.header.getSeqid() == 0 && this.header.getServiceid() == Uint128.ZERO && this.header.getActionid() == Uint128.ZERO) {
this.ping = true;
}
return 0;
}
int len = Math.min(bodyLength - this.bodyOffset, buffer.remaining());
buffer.get(body, this.bodyOffset, len);
this.bodyOffset += len;
int rs = bodyLength - this.bodyOffset;
if (rs == 0) {
this.readState = READ_STATE_END;
} else {
int remain = buffer.remaining();
int expect = halfArray == null ? bodyLength : bodyLength - halfArray.length();
if (remain < expect) {
if (halfArray == null) {
halfArray = new ByteArray();
}
halfArray.put(buffer);
buffer.clear();
return expect - remain;
}
return rs;
if (halfArray == null || halfArray.length() == 0) {
this.body = new byte[bodyLength];
buffer.get(body);
} else {
halfArray.put(buffer, expect);
this.body = halfArray.getBytes();
}
this.readState = READ_STATE_END;
halfArray = null;
return 0;
}
return 0;
}
@@ -116,8 +160,7 @@ public class SncpRequest extends Request<SncpContext> {
@Override
public String toString() {
return SncpRequest.class.getSimpleName() + "_" + Objects.hashCode(this)
+ "{header=" + this.header + ",bodyOffset=" + this.bodyOffset
+ ",body=[" + (this.body == null ? -1 : this.body.length) + "]}";
+ "{header=" + this.header + ",body=[" + (this.body == null ? -1 : this.body.length) + "]}";
}
@Override
@@ -125,7 +168,7 @@ public class SncpRequest extends Request<SncpContext> {
this.reader.clear();
this.readState = READ_STATE_ROUTE;
this.header = null;
this.bodyOffset = 0;
this.halfArray = null;
this.body = null;
this.ping = false;
super.recycle();