lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-30 22:15:27 -05:00
Code Issues Releases Wiki Activity

cleanup buffer usage

Browse Source
This commit is contained in:
Darien Raymond
2017-11-09 22:33:15 +01:00
parent 6e61538b36
commit 594ec15c09
41 changed files with 358 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
common/buf/reader_test.go
View File

@@ -15,11 +15,11 @@ func TestAdaptiveReader(t *testing.T) {
assert := With(t)
reader := NewReader(bytes.NewReader(make([]byte, 1024*1024)))
b, err := reader.Read()
b, err := reader.ReadMultiBuffer()
assert(err, IsNil)
assert(b.Len(), Equals, 2*1024)
b, err = reader.Read()
b, err = reader.ReadMultiBuffer()
assert(err, IsNil)
assert(b.Len(), Equals, 32*1024)
}
@@ -28,22 +28,23 @@ func TestBytesReaderWriteTo(t *testing.T) {
assert := With(t)
stream := ray.NewStream(context.Background())
reader := ToBytesReader(stream)
reader := NewBufferedReader(stream)
b1 := New()
b1.AppendBytes('a', 'b', 'c')
b2 := New()
b2.AppendBytes('e', 'f', 'g')
assert(stream.Write(NewMultiBufferValue(b1, b2)), IsNil)
assert(stream.WriteMultiBuffer(NewMultiBufferValue(b1, b2)), IsNil)
stream.Close()
stream2 := ray.NewStream(context.Background())
writer := ToBytesWriter(stream2)
writer := NewBufferedWriter(stream2)
writer.SetBuffered(false)
nBytes, err := io.Copy(writer, reader)
assert(err, IsNil)
assert(nBytes, Equals, int64(6))
mb, err := stream2.Read()
mb, err := stream2.ReadMultiBuffer()
assert(err, IsNil)
assert(len(mb), Equals, 2)
assert(mb[0].String(), Equals, "abc")
@@ -54,16 +55,16 @@ func TestBytesReaderMultiBuffer(t *testing.T) {
assert := With(t)
stream := ray.NewStream(context.Background())
reader := ToBytesReader(stream)
reader := NewBufferedReader(stream)
b1 := New()
b1.AppendBytes('a', 'b', 'c')
b2 := New()
b2.AppendBytes('e', 'f', 'g')
assert(stream.Write(NewMultiBufferValue(b1, b2)), IsNil)
assert(stream.WriteMultiBuffer(NewMultiBufferValue(b1, b2)), IsNil)
stream.Close()
mbReader := NewReader(reader)
mb, err := mbReader.Read()
mb, err := mbReader.ReadMultiBuffer()
assert(err, IsNil)
assert(len(mb), Equals, 2)
assert(mb[0].String(), Equals, "abc")