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

Avoid a double check ByteBuf#ensureWritable in ByteBufUtil

Browse Source 
Motivation:

Methods `ByteBufUtil#writeUtf8` and `ByteBufUtil#writeAscii` contains a check `ByteBuf#ensureWritable` before the calling `ByteBuf#writeBytes`. But the `ByteBuf#writeBytes` also do a such check inside.

Modifications:

Make checks more targeted.

Result:

Less redundant method calls.
This commit is contained in:
Nikolay Fedorovskikh 2017-06-28 15:42:03 +05:00 committed by Norman Maurer
parent b7a5743e8b
commit f35047765f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
View File

@ -444,13 +444,11 @@ public final class ByteBufUtil {
* This method returns the actual number of bytes written. * This method returns the actual number of bytes written.
*/ */
public static int writeUtf8(ByteBuf buf, CharSequence seq) { public static int writeUtf8(ByteBuf buf, CharSequence seq) {
final int len = seq.length();
buf.ensureWritable(utf8MaxBytes(seq));
for (;;) { for (;;) {
if (buf instanceof AbstractByteBuf) { if (buf instanceof AbstractByteBuf) {
AbstractByteBuf byteBuf = (AbstractByteBuf) buf; AbstractByteBuf byteBuf = (AbstractByteBuf) buf;
int written = writeUtf8(byteBuf, byteBuf.writerIndex, seq, len); byteBuf.ensureWritable(utf8MaxBytes(seq));
int written = writeUtf8(byteBuf, byteBuf.writerIndex, seq, seq.length());
byteBuf.writerIndex += written; byteBuf.writerIndex += written;
return written; return written;
} else if (buf instanceof WrappedByteBuf) { } else if (buf instanceof WrappedByteBuf) {
@ -543,14 +541,14 @@ public final class ByteBufUtil {
public static int writeAscii(ByteBuf buf, CharSequence seq) { public static int writeAscii(ByteBuf buf, CharSequence seq) {
// ASCII uses 1 byte per char // ASCII uses 1 byte per char
final int len = seq.length(); final int len = seq.length();
buf.ensureWritable(len);
if (seq instanceof AsciiString) { if (seq instanceof AsciiString) {
AsciiString asciiString = (AsciiString) seq; AsciiString asciiString = (AsciiString) seq;
buf.writeBytes(asciiString.array(), asciiString.arrayOffset(), asciiString.length()); buf.writeBytes(asciiString.array(), asciiString.arrayOffset(), len);
} else { } else {
for (;;) { for (;;) {
if (buf instanceof AbstractByteBuf) { if (buf instanceof AbstractByteBuf) {
AbstractByteBuf byteBuf = (AbstractByteBuf) buf; AbstractByteBuf byteBuf = (AbstractByteBuf) buf;
byteBuf.ensureWritable(len);
int written = writeAscii(byteBuf, byteBuf.writerIndex, seq, len); int written = writeAscii(byteBuf, byteBuf.writerIndex, seq, len);
byteBuf.writerIndex += written; byteBuf.writerIndex += written;
return written; return written;