From aabb9137e1e3e873d330714a82499faf7a477c7f Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Tue, 1 Nov 2016 12:34:07 +0100 Subject: [PATCH] remove unused code --- transport/internet/kcp/buffer.go | 102 -------------------------- transport/internet/kcp/buffer_test.go | 39 ---------- 2 files changed, 141 deletions(-) delete mode 100644 transport/internet/kcp/buffer.go delete mode 100644 transport/internet/kcp/buffer_test.go diff --git a/transport/internet/kcp/buffer.go b/transport/internet/kcp/buffer.go deleted file mode 100644 index 98e2f913..00000000 --- a/transport/internet/kcp/buffer.go +++ /dev/null @@ -1,102 +0,0 @@ -package kcp - -import ( - "sync" - - "v2ray.com/core/common/alloc" -) - -const ( - NumDistro = 5 - DistroSize = 1600 -) - -type Buffer struct { - sync.Mutex - buffer *alloc.Buffer - - next int - released int - hold bool - distro [NumDistro]*alloc.Buffer -} - -func NewBuffer() *Buffer { - b := &Buffer{ - next: 0, - released: 0, - hold: true, - buffer: alloc.NewBuffer(), - } - for idx := range b.distro { - content := b.buffer.Value[idx*DistroSize : (idx+1)*DistroSize] - b.distro[idx] = alloc.CreateBuffer(content, b) - } - return b -} - -func (this *Buffer) IsEmpty() bool { - this.Lock() - defer this.Unlock() - - return this.next == NumDistro -} - -func (this *Buffer) Allocate() *alloc.Buffer { - this.Lock() - defer this.Unlock() - if this.next == NumDistro { - return nil - } - b := this.distro[this.next] - this.next++ - return b -} - -func (this *Buffer) Free(b *alloc.Buffer) { - this.Lock() - defer this.Unlock() - - this.released++ - if !this.hold && this.released == this.next { - this.ReleaseBuffer() - } -} - -func (this *Buffer) Release() { - this.Lock() - defer this.Unlock() - - if this.next == this.released { - this.ReleaseBuffer() - } - this.hold = false -} - -func (this *Buffer) ReleaseBuffer() { - this.buffer.Release() - this.buffer = nil - for idx := range this.distro { - this.distro[idx] = nil - } -} - -var ( - globalBuffer *Buffer - globalBufferAccess sync.Mutex -) - -func AllocateBuffer() *alloc.Buffer { - globalBufferAccess.Lock() - defer globalBufferAccess.Unlock() - - if globalBuffer == nil { - globalBuffer = NewBuffer() - } - b := globalBuffer.Allocate() - if globalBuffer.IsEmpty() { - globalBuffer.Release() - globalBuffer = nil - } - return b -} diff --git a/transport/internet/kcp/buffer_test.go b/transport/internet/kcp/buffer_test.go deleted file mode 100644 index c9fddb0b..00000000 --- a/transport/internet/kcp/buffer_test.go +++ /dev/null @@ -1,39 +0,0 @@ -package kcp_test - -import ( - "testing" - - "v2ray.com/core/testing/assert" - . "v2ray.com/core/transport/internet/kcp" -) - -func TestBuffer(t *testing.T) { - assert := assert.On(t) - - b := NewBuffer() - - for i := 0; i < NumDistro; i++ { - x := b.Allocate() - assert.Pointer(x).IsNotNil() - x.Release() - } - assert.Pointer(b.Allocate()).IsNil() - b.Release() -} - -func TestSingleRelease(t *testing.T) { - assert := assert.On(t) - - b := NewBuffer() - x := b.Allocate() - x.Release() - - y := b.Allocate() - assert.Pointer(y.Value).IsNotNil() - - b.Release() - y.Release() - - z := b.Allocate() - assert.Pointer(z).IsNil() -}