rename NewLocal to NewSize

pull/962/head
Darien Raymond 2018-03-11 23:29:17 +01:00
parent f97e6fa3d2
commit 994aecd13c
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
13 changed files with 18 additions and 18 deletions

View File

@ -55,7 +55,7 @@ func (r *PacketReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
if size <= buf.Size {
b = buf.New()
} else {
b = buf.NewLocal(uint32(size))
b = buf.NewSize(uint32(size))
}
if err := b.AppendSupplier(buf.ReadFullFrom(r.reader, int(size))); err != nil {
b.Release()

View File

@ -172,15 +172,15 @@ func (b *Buffer) String() string {
return string(b.Bytes())
}
// New creates a Buffer with 0 length and 8K capacity.
// New creates a Buffer with 0 length and 2K capacity.
func New() *Buffer {
return &Buffer{
v: pool2k.Get().([]byte),
}
}
// NewLocal creates and returns a buffer with 0 length and given capacity on current thread.
func NewLocal(size uint32) *Buffer {
// NewSize creates and returns a buffer given capacity.
func NewSize(size uint32) *Buffer {
return &Buffer{
v: NewBytes(size),
}

View File

@ -50,7 +50,7 @@ func BenchmarkNewBuffer(b *testing.B) {
func BenchmarkNewLocalBuffer(b *testing.B) {
for i := 0; i < b.N; i++ {
buffer := NewLocal(Size)
buffer := NewSize(Size)
buffer.Release()
}
}

View File

@ -128,7 +128,7 @@ func (r *AuthenticationReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
if size <= buf.Size {
b = buf.New()
} else {
b = buf.NewLocal(uint32(size))
b = buf.NewSize(uint32(size))
}
if err := b.Reset(buf.ReadFullFrom(r.reader, size)); err != nil {
b.Release()

View File

@ -27,10 +27,10 @@ func TestAuthenticationReaderWriter(t *testing.T) {
rawPayload := make([]byte, 8192*10)
rand.Read(rawPayload)
payload := buf.NewLocal(8192 * 10)
payload := buf.NewSize(8192 * 10)
payload.Append(rawPayload)
cache := buf.NewLocal(160 * 1024)
cache := buf.NewSize(160 * 1024)
iv := make([]byte, 12)
rand.Read(iv)
@ -83,7 +83,7 @@ func TestAuthenticationReaderWriterPacket(t *testing.T) {
aead, err := cipher.NewGCM(block)
assert(err, IsNil)
cache := buf.NewLocal(1024)
cache := buf.NewSize(1024)
iv := make([]byte, 12)
rand.Read(iv)

View File

@ -12,7 +12,7 @@ import (
func TestChunkStreamIO(t *testing.T) {
assert := With(t)
cache := buf.NewLocal(8192)
cache := buf.NewSize(8192)
writer := NewChunkStreamWriter(PlainChunkSizeParser{}, cache)
reader := NewChunkStreamReader(PlainChunkSizeParser{}, cache)

View File

@ -81,7 +81,7 @@ func (v *ChunkReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
if length > buf.Size {
// Theoretically the size of a chunk is 64K, but most Shadowsocks implementations used <4K buffer.
buffer.Release()
buffer = buf.NewLocal(uint32(length) + 128)
buffer = buf.NewSize(uint32(length) + 128)
}
buffer.Clear()

View File

@ -24,11 +24,11 @@ func TestNormalChunkReading(t *testing.T) {
func TestNormalChunkWriting(t *testing.T) {
assert := With(t)
buffer := buf.NewLocal(512)
buffer := buf.NewSize(512)
writer := NewChunkWriter(buffer, NewAuthenticator(ChunkKeyGenerator(
[]byte{21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36})))
b := buf.NewLocal(256)
b := buf.NewSize(256)
b.Append([]byte{11, 12, 13, 14, 15, 16, 17, 18})
err := writer.WriteMultiBuffer(buf.NewMultiBufferValue(b))
assert(err, IsNil)

View File

@ -29,7 +29,7 @@ func TestUDPEncoding(t *testing.T) {
},
}
data := buf.NewLocal(256)
data := buf.NewSize(256)
data.AppendSupplier(serial.WriteString("test string"))
encodedData, err := EncodeUDPPacket(request, data.Bytes())
assert(err, IsNil)

View File

@ -16,7 +16,7 @@ func TestReaderWriter(t *testing.T) {
assert := With(t)
cache := buf.New()
b := buf.NewLocal(256)
b := buf.NewSize(256)
b.AppendSupplier(serial.WriteString("abcd" + ENDING))
writer := NewHeaderWriter(b)
err := writer.Write(cache)

View File

@ -18,7 +18,7 @@ func TestSRTPWrite(t *testing.T) {
srtp := srtpRaw.(*SRTP)
payload := buf.NewLocal(2048)
payload := buf.NewSize(2048)
payload.AppendSupplier(srtp.Write)
payload.Append(content)

View File

@ -18,7 +18,7 @@ func TestUTPWrite(t *testing.T) {
utp := utpRaw.(*UTP)
payload := buf.NewLocal(2048)
payload := buf.NewSize(2048)
payload.AppendSupplier(utp.Write)
payload.Append(content)

View File

@ -17,7 +17,7 @@ func TestUTPWrite(t *testing.T) {
video := videoRaw.(*VideoChat)
payload := buf.NewLocal(2048)
payload := buf.NewSize(2048)
payload.AppendSupplier(video.Write)
assert(payload.Len(), Equals, video.Size())