cleanup MultiBuffer

common/buf/multi_buffer.go

@@ -20,7 +20,7 @@ type MultiBufferReader interface {
 
 // ReadAllToMultiBuffer reads all content from the reader into a MultiBuffer, until EOF.
 func ReadAllToMultiBuffer(reader io.Reader) (MultiBuffer, error) {
-	mb := NewMultiBuffer()
+	mb := NewMultiBufferCap(128)
 
 	for {
 		b := New()
@@ -55,9 +55,9 @@ func ReadAllToBytes(reader io.Reader) ([]byte, error) {
 // MultiBuffer is a list of Buffers. The order of Buffer matters.
 type MultiBuffer []*Buffer
 
-// NewMultiBuffer creates a new MultiBuffer instance.
-func NewMultiBuffer() MultiBuffer {
-	return MultiBuffer(make([]*Buffer, 0, 128))
+// NewMultiBufferCap creates a new MultiBuffer instance.
+func NewMultiBufferCap(capacity int) MultiBuffer {
+	return MultiBuffer(make([]*Buffer, 0, capacity))
 }
 
 // NewMultiBufferValue wraps a list of Buffers into MultiBuffer.
@@ -149,7 +149,7 @@ func (mb *MultiBuffer) Release() {
 		b.Release()
 		(*mb)[i] = nil
 	}
-	*mb = (*mb)[:0]
+	*mb = nil
 }
 
 // ToNetBuffers converts this MultiBuffer to net.Buffers. The return net.Buffers points to the same content of the MultiBuffer.
@@ -163,7 +163,7 @@ func (mb MultiBuffer) ToNetBuffers() net.Buffers {
 
 // SliceBySize splits the begining of this MultiBuffer into another one, for at most size bytes.
 func (mb *MultiBuffer) SliceBySize(size int) MultiBuffer {
-	slice := NewMultiBuffer()
+	slice := NewMultiBufferCap(10)
 	sliceSize := 0
 	endIndex := len(*mb)
 	for i, b := range *mb {

common/buf/reader.go

@@ -41,7 +41,7 @@ func (r *BytesToBufferReader) Read() (MultiBuffer, error) {
 		return nil, err
 	}
 
-	mb := NewMultiBuffer()
+	mb := NewMultiBufferCap(nBytes/Size + 1)
 	mb.Write(r.buffer[:nBytes])
 	return mb, nil
 }

common/buf/writer.go

@@ -75,7 +75,7 @@ type bytesToBufferWriter struct {
 
 // Write implements io.Writer.
 func (w *bytesToBufferWriter) Write(payload []byte) (int, error) {
-	mb := NewMultiBuffer()
+	mb := NewMultiBufferCap(len(payload)/Size + 1)
 	mb.Write(payload)
 	if err := w.writer.Write(mb); err != nil {
 		return 0, err

common/crypto/auth.go

@@ -157,7 +157,7 @@ func (r *AuthenticationReader) Read() (buf.MultiBuffer, error) {
 		return nil, err
 	}
 
-	mb := buf.NewMultiBuffer()
+	var mb buf.MultiBuffer
 	if r.transferType == protocol.TransferTypeStream {
 		mb.Write(b)
 	} else {

common/crypto/auth_test.go

@@ -44,7 +44,7 @@ func TestAuthenticationReaderWriter(t *testing.T) {
 
 	assert(writer.Write(buf.NewMultiBufferValue(payload)), IsNil)
 	assert(cache.Len(), Equals, 83360)
-	assert(writer.Write(buf.NewMultiBuffer()), IsNil)
+	assert(writer.Write(buf.MultiBuffer{}), IsNil)
 	assert(err, IsNil)
 
 	reader := NewAuthenticationReader(&AEADAuthenticator{
@@ -55,7 +55,7 @@ func TestAuthenticationReaderWriter(t *testing.T) {
 		AdditionalDataGenerator: &NoOpBytesGenerator{},
 	}, PlainChunkSizeParser{}, cache, protocol.TransferTypeStream)
 
-	mb := buf.NewMultiBuffer()
+	var mb buf.MultiBuffer
 
 	for mb.Len() < len(rawPayload) {
 		mb2, err := reader.Read()
@@ -95,7 +95,7 @@ func TestAuthenticationReaderWriterPacket(t *testing.T) {
 		AdditionalDataGenerator: &NoOpBytesGenerator{},
 	}, PlainChunkSizeParser{}, cache, protocol.TransferTypePacket)
 
-	payload := buf.NewMultiBuffer()
+	var payload buf.MultiBuffer
 	pb1 := buf.New()
 	pb1.Append([]byte("abcd"))
 	payload.Append(pb1)
@@ -106,7 +106,7 @@ func TestAuthenticationReaderWriterPacket(t *testing.T) {
 
 	assert(writer.Write(payload), IsNil)
 	assert(cache.Len(), GreaterThan, 0)
-	assert(writer.Write(buf.NewMultiBuffer()), IsNil)
+	assert(writer.Write(buf.MultiBuffer{}), IsNil)
 	assert(err, IsNil)
 
 	reader := NewAuthenticationReader(&AEADAuthenticator{

common/crypto/chunk.go

@@ -48,6 +48,7 @@ func NewChunkStreamReader(sizeDecoder ChunkSizeDecoder, reader io.Reader) *Chunk
 		sizeDecoder: sizeDecoder,
 		reader:      buf.NewReader(reader),
 		buffer:      make([]byte, sizeDecoder.SizeBytes()),
+		leftOver: buf.NewMultiBufferCap(16),
 	}
 }
 
@@ -129,8 +130,9 @@ func NewChunkStreamWriter(sizeEncoder ChunkSizeEncoder, writer io.Writer) *Chunk
 }
 
 func (w *ChunkStreamWriter) Write(mb buf.MultiBuffer) error {
-	mb2Write := buf.NewMultiBuffer()
 	const sliceSize = 8192
+	mbLen := mb.Len()
+	mb2Write := buf.NewMultiBufferCap(mbLen / buf.Size + mbLen / sliceSize + 2)
 
 	for {
 		slice := mb.SliceBySize(sliceSize)

common/crypto/chunk_test.go

@@ -25,7 +25,7 @@ func TestChunkStreamIO(t *testing.T) {
 	b.AppendBytes('e', 'f', 'g')
 	assert(writer.Write(buf.NewMultiBufferValue(b)), IsNil)
 
-	assert(writer.Write(buf.NewMultiBuffer()), IsNil)
+	assert(writer.Write(buf.MultiBuffer{}), IsNil)
 
 	assert(cache.Len(), Equals, 13)