lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-15 08:46:34 -05:00
Code Issues Releases Wiki Activity

cleanup MultiBuffer

Browse Source
This commit is contained in:
Darien Raymond 2017-11-09 00:55:28 +01:00
parent 3d2fd372e1
commit 66b82e4ab7
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
14 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/proxyman/mux/mux_test.go
View File

@ -14,7 +14,7 @@ import (
)
func readAll(reader buf.Reader) (buf.MultiBuffer, error) {
mb := buf.NewMultiBuffer()
var mb buf.MultiBuffer
for {
b, err := reader.Read()
if err == io.EOF {

2
app/proxyman/mux/reader.go
View File

@ -94,7 +94,7 @@ func (r *StreamReader) Read() (buf.MultiBuffer, error) {
r.leftOver = int(size)
}
mb := buf.NewMultiBuffer()
mb := buf.NewMultiBufferCap(32)
for r.leftOver > 0 {
readLen := buf.Size
if r.leftOver < readLen {

2
app/proxyman/mux/writer.go
View File

@ -71,7 +71,7 @@ func (w *Writer) writeData(mb buf.MultiBuffer) error {
return err
}
mb2 := buf.NewMultiBuffer()
mb2 := buf.NewMultiBufferCap(len(mb) + 1)
mb2.Append(frame)
mb2.AppendMulti(mb)
return w.writer.Write(mb2)

12
common/buf/multi_buffer.go
View File

@ -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 {

2
common/buf/reader.go
View File

@ -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
}

2
common/buf/writer.go
View File

@ -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

2
common/crypto/auth.go
View File

@ -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 {

8
common/crypto/auth_test.go
View File

@ -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{

4
common/crypto/chunk.go
View File

@ -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)

2
common/crypto/chunk_test.go
View File

@ -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)

2
proxy/vmess/inbound/inbound.go
View File

@ -163,7 +163,7 @@ func transferResponse(timer signal.ActivityUpdater, session *encoding.ServerSess
}
if request.Option.Has(protocol.RequestOptionChunkStream) {
if err := bodyWriter.Write(buf.NewMultiBuffer()); err != nil {
if err := bodyWriter.Write(buf.MultiBuffer{}); err != nil {
return err
}
}

2
proxy/vmess/outbound/outbound.go
View File

@ -132,7 +132,7 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
}
if request.Option.Has(protocol.RequestOptionChunkStream) {
if err := bodyWriter.Write(buf.NewMultiBuffer()); err != nil {
if err := bodyWriter.Write(buf.MultiBuffer{}); err != nil {
return err
}
}

2
transport/internet/kcp/receiving.go
View File

@ -203,7 +203,7 @@ func (v *ReceivingWorker) ReadMultiBuffer() buf.MultiBuffer {
return mb
}
mb := buf.NewMultiBuffer()
mb := buf.NewMultiBufferCap(32)
v.Lock()
defer v.Unlock()

6
transport/ray/direct.go
View File

@ -197,10 +197,10 @@ func (s *Stream) Write(data buf.MultiBuffer) error {
}
if s.data == nil {
s.data = data
} else {
s.data.AppendMulti(data)
s.data = buf.NewMultiBufferCap(128)
}
s.data.AppendMulti(data)
s.size += uint64(data.Len())
s.notifyWrite()