mirror of
https://github.com/v2fly/v2ray-core
synced 2024-02-27 03:18:06 +00:00
refine buffer interface
This commit is contained in:
@@ -35,11 +35,6 @@ func (b *Buffer) Clear() {
|
||||
b.end = 0
|
||||
}
|
||||
|
||||
// AppendBytes appends one or more bytes to the end of the buffer.
|
||||
func (b *Buffer) AppendBytes(bytes ...byte) (int, error) {
|
||||
return b.Write(bytes)
|
||||
}
|
||||
|
||||
// AppendSupplier appends the content of a BytesWriter to the buffer.
|
||||
func (b *Buffer) AppendSupplier(writer Supplier) error {
|
||||
nBytes, err := writer(b.v[b.end:])
|
||||
@@ -145,6 +140,11 @@ func (b *Buffer) Write(data []byte) (int, error) {
|
||||
return nBytes, nil
|
||||
}
|
||||
|
||||
// WriteBytes appends one or more bytes to the end of the buffer.
|
||||
func (b *Buffer) WriteBytes(bytes ...byte) (int, error) {
|
||||
return b.Write(bytes)
|
||||
}
|
||||
|
||||
// Read implements io.Reader.Read().
|
||||
func (b *Buffer) Read(data []byte) (int, error) {
|
||||
if b.Len() == 0 {
|
||||
|
||||
@@ -21,26 +21,6 @@ func ReadAllToMultiBuffer(reader io.Reader) (MultiBuffer, error) {
|
||||
return mb, nil
|
||||
}
|
||||
|
||||
// ReadSizeToMultiBuffer reads specific number of bytes from reader into a MultiBuffer.
|
||||
func ReadSizeToMultiBuffer(reader io.Reader, size int32) (MultiBuffer, error) {
|
||||
mb := NewMultiBufferCap(32)
|
||||
|
||||
for size > 0 {
|
||||
bSize := size
|
||||
if bSize > Size {
|
||||
bSize = Size
|
||||
}
|
||||
b := NewSize(bSize)
|
||||
if err := b.Reset(ReadFullFrom(reader, bSize)); err != nil {
|
||||
mb.Release()
|
||||
return nil, err
|
||||
}
|
||||
size -= bSize
|
||||
mb.Append(b)
|
||||
}
|
||||
return mb, nil
|
||||
}
|
||||
|
||||
// ReadAllToBytes reads all content from the reader into a byte array, until EOF.
|
||||
func ReadAllToBytes(reader io.Reader) ([]byte, error) {
|
||||
mb, err := ReadAllToMultiBuffer(reader)
|
||||
@@ -100,7 +80,7 @@ func (mb *MultiBuffer) ReadFrom(reader io.Reader) (int64, error) {
|
||||
|
||||
for {
|
||||
b := New()
|
||||
err := b.Reset(ReadFrom(reader))
|
||||
err := b.Reset(ReadFullFrom(reader, Size))
|
||||
if b.IsEmpty() {
|
||||
b.Release()
|
||||
} else {
|
||||
@@ -108,7 +88,7 @@ func (mb *MultiBuffer) ReadFrom(reader io.Reader) (int64, error) {
|
||||
}
|
||||
totalBytes += int64(b.Len())
|
||||
if err != nil {
|
||||
if errors.Cause(err) == io.EOF {
|
||||
if errors.Cause(err) == io.EOF || errors.Cause(err) == io.ErrUnexpectedEOF {
|
||||
return totalBytes, nil
|
||||
}
|
||||
return totalBytes, err
|
||||
@@ -178,6 +158,9 @@ func (mb *MultiBuffer) Write(b []byte) (int, error) {
|
||||
// WriteMultiBuffer implements Writer.
|
||||
func (mb *MultiBuffer) WriteMultiBuffer(b MultiBuffer) error {
|
||||
*mb = append(*mb, b...)
|
||||
for i := range b {
|
||||
b[i] = nil
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -14,10 +14,10 @@ func TestMultiBufferRead(t *testing.T) {
|
||||
assert := With(t)
|
||||
|
||||
b1 := New()
|
||||
b1.AppendBytes('a', 'b')
|
||||
b1.WriteBytes('a', 'b')
|
||||
|
||||
b2 := New()
|
||||
b2.AppendBytes('c', 'd')
|
||||
b2.WriteBytes('c', 'd')
|
||||
mb := NewMultiBufferValue(b1, b2)
|
||||
|
||||
bs := make([]byte, 32)
|
||||
@@ -32,7 +32,7 @@ func TestMultiBufferAppend(t *testing.T) {
|
||||
|
||||
var mb MultiBuffer
|
||||
b := New()
|
||||
b.AppendBytes('a', 'b')
|
||||
b.WriteBytes('a', 'b')
|
||||
mb.Append(b)
|
||||
assert(mb.Len(), Equals, int32(2))
|
||||
}
|
||||
|
||||
@@ -37,9 +37,9 @@ func TestBytesReaderWriteTo(t *testing.T) {
|
||||
pReader, pWriter := pipe.New(pipe.WithSizeLimit(1024))
|
||||
reader := &BufferedReader{Reader: pReader}
|
||||
b1 := New()
|
||||
b1.AppendBytes('a', 'b', 'c')
|
||||
b1.WriteBytes('a', 'b', 'c')
|
||||
b2 := New()
|
||||
b2.AppendBytes('e', 'f', 'g')
|
||||
b2.WriteBytes('e', 'f', 'g')
|
||||
assert(pWriter.WriteMultiBuffer(NewMultiBufferValue(b1, b2)), IsNil)
|
||||
pWriter.Close()
|
||||
|
||||
@@ -64,9 +64,9 @@ func TestBytesReaderMultiBuffer(t *testing.T) {
|
||||
pReader, pWriter := pipe.New(pipe.WithSizeLimit(1024))
|
||||
reader := &BufferedReader{Reader: pReader}
|
||||
b1 := New()
|
||||
b1.AppendBytes('a', 'b', 'c')
|
||||
b1.WriteBytes('a', 'b', 'c')
|
||||
b2 := New()
|
||||
b2.AppendBytes('e', 'f', 'g')
|
||||
b2.WriteBytes('e', 'f', 'g')
|
||||
assert(pWriter.WriteMultiBuffer(NewMultiBufferValue(b1, b2)), IsNil)
|
||||
pWriter.Close()
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@ func TestChunkStreamIO(t *testing.T) {
|
||||
reader := NewChunkStreamReader(PlainChunkSizeParser{}, cache)
|
||||
|
||||
b := buf.New()
|
||||
b.AppendBytes('a', 'b', 'c', 'd')
|
||||
b.WriteBytes('a', 'b', 'c', 'd')
|
||||
common.Must(writer.WriteMultiBuffer(buf.NewMultiBufferValue(b)))
|
||||
|
||||
b = buf.New()
|
||||
b.AppendBytes('e', 'f', 'g')
|
||||
b.WriteBytes('e', 'f', 'g')
|
||||
common.Must(writer.WriteMultiBuffer(buf.NewMultiBufferValue(b)))
|
||||
|
||||
common.Must(writer.WriteMultiBuffer(buf.MultiBuffer{}))
|
||||
|
||||
Reference in New Issue
Block a user