andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce object allocation during wrap/unwrap while handshake is in progress

Browse Source 
Motivation:

Unnecessary object allocation is currently done during wrap/unwrap while a handshake is still in progress.

Modifications:

Use static instances when possible.

Result:

Less object creations.
This commit is contained in:
Norman Maurer 2015-04-13 22:18:52 +02:00
parent 19179f9fee
commit d376bf6a58
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
handler/src/main/java/io/netty/handler/ssl/OpenSslEngine.java
View File

@ -120,6 +120,12 @@ public final class OpenSslEngine extends SSLEngine {
private static final long EMPTY_ADDR = Buffer.address(Unpooled.EMPTY_BUFFER.nioBuffer()); private static final long EMPTY_ADDR = Buffer.address(Unpooled.EMPTY_BUFFER.nioBuffer());
private static final SSLEngineResult NEED_UNWRAP_OK = new SSLEngineResult(OK, NEED_UNWRAP, 0, 0);
private static final SSLEngineResult NEED_UNWRAP_CLOSED = new SSLEngineResult(CLOSED, NEED_UNWRAP, 0, 0);
private static final SSLEngineResult NEED_WRAP_OK = new SSLEngineResult(OK, NEED_WRAP, 0, 0);
private static final SSLEngineResult NEED_WRAP_CLOSED = new SSLEngineResult(CLOSED, NEED_WRAP, 0, 0);
private static final SSLEngineResult CLOSED_NOT_HANDSHAKING = new SSLEngineResult(CLOSED, NOT_HANDSHAKING, 0, 0);
// OpenSSL state // OpenSSL state
private long ssl; private long ssl;
private long networkBIO; private long networkBIO;
@ -373,7 +379,7 @@ public final class OpenSslEngine extends SSLEngine {
// Check to make sure the engine has not been closed // Check to make sure the engine has not been closed
if (destroyed != 0) { if (destroyed != 0) {
return new SSLEngineResult(CLOSED, NOT_HANDSHAKING, 0, 0); return CLOSED_NOT_HANDSHAKING;
} }
// Throw required runtime exceptions // Throw required runtime exceptions
@ -403,8 +409,13 @@ public final class OpenSslEngine extends SSLEngine {
// without regard to the handshake status. // without regard to the handshake status.
SSLEngineResult.HandshakeStatus handshakeStatus = handshakeStatus0(); SSLEngineResult.HandshakeStatus handshakeStatus = handshakeStatus0();
if ((!handshakeFinished || engineClosed) && handshakeStatus == NEED_UNWRAP) { if (handshakeStatus == NEED_UNWRAP) {
return new SSLEngineResult(getEngineStatus(), NEED_UNWRAP, 0, 0); if (!handshakeFinished) {
return NEED_UNWRAP_OK;
}
if (engineClosed) {
return NEED_UNWRAP_CLOSED;
}
} }
int bytesProduced = 0; int bytesProduced = 0;
@ -484,7 +495,7 @@ public final class OpenSslEngine extends SSLEngine {
// Check to make sure the engine has not been closed // Check to make sure the engine has not been closed
if (destroyed != 0) { if (destroyed != 0) {
return new SSLEngineResult(CLOSED, NOT_HANDSHAKING, 0, 0); return CLOSED_NOT_HANDSHAKING;
} }
// Throw requried runtime exceptions // Throw requried runtime exceptions
@ -526,8 +537,13 @@ public final class OpenSslEngine extends SSLEngine {
// In handshake or close_notify stages, check if call to unwrap was made // In handshake or close_notify stages, check if call to unwrap was made
// without regard to the handshake status. // without regard to the handshake status.
SSLEngineResult.HandshakeStatus handshakeStatus = handshakeStatus0(); SSLEngineResult.HandshakeStatus handshakeStatus = handshakeStatus0();
if ((!handshakeFinished || engineClosed) && handshakeStatus == NEED_WRAP) { if (handshakeStatus == NEED_WRAP) {
return new SSLEngineResult(getEngineStatus(), NEED_WRAP, 0, 0); if (!handshakeFinished) {
return NEED_WRAP_OK;
}
if (engineClosed) {
return NEED_WRAP_CLOSED;
}
} }
final int srcsEndOffset = srcsOffset + srcsLength; final int srcsEndOffset = srcsOffset + srcsLength;