From 43dacc3936059b2e2ae0b13ac91879fe8b51a863 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Tue, 1 Nov 2016 12:37:35 +0100 Subject: [PATCH] remove small buffer pool --- common/alloc/buffer.go | 9 --------- common/alloc/buffer_pool.go | 3 --- proxy/shadowsocks/server.go | 3 --- proxy/socks/protocol/socks.go | 4 ++-- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/common/alloc/buffer.go b/common/alloc/buffer.go index 41eb2109a..9225b3741 100644 --- a/common/alloc/buffer.go +++ b/common/alloc/buffer.go @@ -200,11 +200,6 @@ func (b *Buffer) String() string { return string(b.Value) } -// NewSmallBuffer creates a Buffer with 1K bytes of arbitrary content. -func NewSmallBuffer() *Buffer { - return smallPool.Allocate() -} - // NewBuffer creates a Buffer with 8K bytes of arbitrary content. func NewBuffer() *Buffer { return mediumPool.Allocate() @@ -216,10 +211,6 @@ func NewLargeBuffer() *Buffer { } func NewBufferWithSize(size int) *Buffer { - if size <= SmallBufferSize { - return NewSmallBuffer() - } - if size <= BufferSize { return NewBuffer() } diff --git a/common/alloc/buffer_pool.go b/common/alloc/buffer_pool.go index da8d23349..c17b37a54 100644 --- a/common/alloc/buffer_pool.go +++ b/common/alloc/buffer_pool.go @@ -52,8 +52,6 @@ func (p *BufferPool) Free(buffer *Buffer) { } const ( - SmallBufferSize = 1600 - defaultOffset - mediumBufferByteSize = 8 * 1024 BufferSize = mediumBufferByteSize - defaultOffset @@ -64,7 +62,6 @@ const ( ) var ( - smallPool = NewBufferPool(1600, 256) mediumPool *BufferPool largePool *BufferPool ) diff --git a/proxy/shadowsocks/server.go b/proxy/shadowsocks/server.go index 97196f639..00615f1cb 100644 --- a/proxy/shadowsocks/server.go +++ b/proxy/shadowsocks/server.go @@ -126,9 +126,6 @@ func (this *Server) handlerUDPPayload(payload *alloc.Buffer, session *proxy.Sess func (this *Server) handleConnection(conn internet.Connection) { defer conn.Close() - buffer := alloc.NewSmallBuffer() - defer buffer.Release() - timedReader := v2net.NewTimeOutReader(16, conn) defer timedReader.Release() diff --git a/proxy/socks/protocol/socks.go b/proxy/socks/protocol/socks.go index 6057fb747..847764c8c 100644 --- a/proxy/socks/protocol/socks.go +++ b/proxy/socks/protocol/socks.go @@ -120,7 +120,7 @@ func (request Socks5UserPassRequest) AuthDetail() string { } func ReadUserPassRequest(reader io.Reader) (request Socks5UserPassRequest, err error) { - buffer := alloc.NewSmallBuffer() + buffer := alloc.NewLocalBuffer(512) defer buffer.Release() _, err = reader.Read(buffer.Value[0:2]) @@ -186,7 +186,7 @@ type Socks5Request struct { } func ReadRequest(reader io.Reader) (request *Socks5Request, err error) { - buffer := alloc.NewSmallBuffer() + buffer := alloc.NewLocalBuffer(512) defer buffer.Release() _, err = io.ReadFull(reader, buffer.Value[:4])