Преглед на файлове

remove small buffer pool

Darien Raymond преди 9 години
родител
ревизия
43dacc3936
променени са 4 файла, в които са добавени 2 реда и са изтрити 17 реда
  1. 0 9
      common/alloc/buffer.go
  2. 0 3
      common/alloc/buffer_pool.go
  3. 0 3
      proxy/shadowsocks/server.go
  4. 2 2
      proxy/socks/protocol/socks.go

+ 0 - 9
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()
 	}

+ 0 - 3
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
 )

+ 0 - 3
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()
 

+ 2 - 2
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])