mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-20 23:06:08 +00:00
cleanup buffer usage
This commit is contained in:
41 files changed
+358
-529
No files matched your search
@@ -106,7 +106,7 @@ func (s *Stream) Peek(b *buf.Buffer) {
|
||||
}
|
||||
|
||||
// Read reads data from the Stream.
|
||||
func (s *Stream) Read() (buf.MultiBuffer, error) {
|
||||
func (s *Stream) ReadMultiBuffer() (buf.MultiBuffer, error) {
|
||||
for {
|
||||
mb, err := s.getData()
|
||||
if err != nil {
|
||||
@@ -178,7 +178,7 @@ func (s *Stream) waitForStreamSize() error {
|
||||
}
|
||||
|
||||
// Write writes more data into the Stream.
|
||||
func (s *Stream) Write(data buf.MultiBuffer) error {
|
||||
func (s *Stream) WriteMultiBuffer(data buf.MultiBuffer) error {
|
||||
if data.IsEmpty() {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -16,18 +16,18 @@ func TestStreamIO(t *testing.T) {
|
||||
stream := NewStream(context.Background())
|
||||
b1 := buf.New()
|
||||
b1.AppendBytes('a')
|
||||
assert(stream.Write(buf.NewMultiBufferValue(b1)), IsNil)
|
||||
assert(stream.WriteMultiBuffer(buf.NewMultiBufferValue(b1)), IsNil)
|
||||
|
||||
_, err := stream.Read()
|
||||
_, err := stream.ReadMultiBuffer()
|
||||
assert(err, IsNil)
|
||||
|
||||
stream.Close()
|
||||
_, err = stream.Read()
|
||||
_, err = stream.ReadMultiBuffer()
|
||||
assert(err, Equals, io.EOF)
|
||||
|
||||
b2 := buf.New()
|
||||
b2.AppendBytes('b')
|
||||
err = stream.Write(buf.NewMultiBufferValue(b2))
|
||||
err = stream.WriteMultiBuffer(buf.NewMultiBufferValue(b2))
|
||||
assert(err, Equals, io.ErrClosedPipe)
|
||||
}
|
||||
|
||||
@@ -37,13 +37,13 @@ func TestStreamClose(t *testing.T) {
|
||||
stream := NewStream(context.Background())
|
||||
b1 := buf.New()
|
||||
b1.AppendBytes('a')
|
||||
assert(stream.Write(buf.NewMultiBufferValue(b1)), IsNil)
|
||||
assert(stream.WriteMultiBuffer(buf.NewMultiBufferValue(b1)), IsNil)
|
||||
|
||||
stream.Close()
|
||||
|
||||
_, err := stream.Read()
|
||||
_, err := stream.ReadMultiBuffer()
|
||||
assert(err, IsNil)
|
||||
|
||||
_, err = stream.Read()
|
||||
_, err = stream.ReadMultiBuffer()
|
||||
assert(err, Equals, io.EOF)
|
||||
}
|
||||
Reference in new issue
Block a user