mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-19 23:03:08 +00:00
refactor io package
This commit is contained in:
36 files changed
+390
-414
No files matched your search
@@ -0,0 +1,68 @@
|
||||
package bufio
|
||||
|
||||
import (
|
||||
"io"
|
||||
"sync"
|
||||
|
||||
"v2ray.com/core/common/buf"
|
||||
)
|
||||
|
||||
type BufferedReader struct {
|
||||
sync.Mutex
|
||||
reader io.Reader
|
||||
buffer *buf.Buffer
|
||||
cached bool
|
||||
}
|
||||
|
||||
func NewReader(rawReader io.Reader) *BufferedReader {
|
||||
return &BufferedReader{
|
||||
reader: rawReader,
|
||||
buffer: buf.New(),
|
||||
cached: true,
|
||||
}
|
||||
}
|
||||
|
||||
func (v *BufferedReader) Release() {
|
||||
v.Lock()
|
||||
defer v.Unlock()
|
||||
|
||||
v.buffer.Release()
|
||||
v.buffer = nil
|
||||
v.reader = nil
|
||||
}
|
||||
|
||||
func (v *BufferedReader) Cached() bool {
|
||||
return v.cached
|
||||
}
|
||||
|
||||
func (v *BufferedReader) SetCached(cached bool) {
|
||||
v.cached = cached
|
||||
}
|
||||
|
||||
func (v *BufferedReader) Read(b []byte) (int, error) {
|
||||
v.Lock()
|
||||
defer v.Unlock()
|
||||
|
||||
if v.reader == nil {
|
||||
return 0, io.EOF
|
||||
}
|
||||
|
||||
if !v.cached {
|
||||
if !v.buffer.IsEmpty() {
|
||||
return v.buffer.Read(b)
|
||||
}
|
||||
return v.reader.Read(b)
|
||||
}
|
||||
if v.buffer.IsEmpty() {
|
||||
err := v.buffer.AppendSupplier(buf.ReadFrom(v.reader))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
}
|
||||
|
||||
if v.buffer.IsEmpty() {
|
||||
return 0, nil
|
||||
}
|
||||
|
||||
return v.buffer.Read(b)
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package bufio_test
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"testing"
|
||||
|
||||
"v2ray.com/core/common/buf"
|
||||
. "v2ray.com/core/common/bufio"
|
||||
"v2ray.com/core/testing/assert"
|
||||
)
|
||||
|
||||
func TestBufferedReader(t *testing.T) {
|
||||
assert := assert.On(t)
|
||||
|
||||
content := buf.New()
|
||||
content.AppendSupplier(buf.ReadFrom(rand.Reader))
|
||||
|
||||
len := content.Len()
|
||||
|
||||
reader := NewReader(content)
|
||||
assert.Bool(reader.Cached()).IsTrue()
|
||||
|
||||
payload := make([]byte, 16)
|
||||
|
||||
nBytes, err := reader.Read(payload)
|
||||
assert.Int(nBytes).Equals(16)
|
||||
assert.Error(err).IsNil()
|
||||
|
||||
len2 := content.Len()
|
||||
assert.Int(len - len2).GreaterThan(16)
|
||||
|
||||
nBytes, err = reader.Read(payload)
|
||||
assert.Int(nBytes).Equals(16)
|
||||
assert.Error(err).IsNil()
|
||||
|
||||
assert.Int(content.Len()).Equals(len2)
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
package bufio
|
||||
|
||||
import (
|
||||
"io"
|
||||
"sync"
|
||||
|
||||
"v2ray.com/core/common/buf"
|
||||
"v2ray.com/core/common/errors"
|
||||
)
|
||||
|
||||
type BufferedWriter struct {
|
||||
sync.Mutex
|
||||
writer io.Writer
|
||||
buffer *buf.Buffer
|
||||
cached bool
|
||||
}
|
||||
|
||||
func NewWriter(rawWriter io.Writer) *BufferedWriter {
|
||||
return &BufferedWriter{
|
||||
writer: rawWriter,
|
||||
buffer: buf.NewSmall(),
|
||||
cached: true,
|
||||
}
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) ReadFrom(reader io.Reader) (int64, error) {
|
||||
v.Lock()
|
||||
defer v.Unlock()
|
||||
|
||||
if v.writer == nil {
|
||||
return 0, io.ErrClosedPipe
|
||||
}
|
||||
|
||||
totalBytes := int64(0)
|
||||
for {
|
||||
oriSize := v.buffer.Len()
|
||||
err := v.buffer.AppendSupplier(buf.ReadFrom(reader))
|
||||
totalBytes += int64(v.buffer.Len() - oriSize)
|
||||
if err != nil {
|
||||
if errors.Cause(err) == io.EOF {
|
||||
return totalBytes, nil
|
||||
}
|
||||
return totalBytes, err
|
||||
}
|
||||
v.FlushWithoutLock()
|
||||
}
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) Write(b []byte) (int, error) {
|
||||
v.Lock()
|
||||
defer v.Unlock()
|
||||
|
||||
if v.writer == nil {
|
||||
return 0, io.ErrClosedPipe
|
||||
}
|
||||
|
||||
if !v.cached {
|
||||
return v.writer.Write(b)
|
||||
}
|
||||
nBytes, err := v.buffer.Write(b)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if v.buffer.IsFull() {
|
||||
err := v.FlushWithoutLock()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if nBytes < len(b) {
|
||||
if _, err := v.writer.Write(b[nBytes:]); err != nil {
|
||||
return nBytes, err
|
||||
}
|
||||
}
|
||||
}
|
||||
return len(b), nil
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) Flush() error {
|
||||
v.Lock()
|
||||
defer v.Unlock()
|
||||
|
||||
if v.writer == nil {
|
||||
return io.ErrClosedPipe
|
||||
}
|
||||
|
||||
return v.FlushWithoutLock()
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) FlushWithoutLock() error {
|
||||
defer v.buffer.Clear()
|
||||
for !v.buffer.IsEmpty() {
|
||||
nBytes, err := v.writer.Write(v.buffer.Bytes())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
v.buffer.SliceFrom(nBytes)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) Cached() bool {
|
||||
return v.cached
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) SetCached(cached bool) {
|
||||
v.cached = cached
|
||||
if !cached && !v.buffer.IsEmpty() {
|
||||
v.Flush()
|
||||
}
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) Release() {
|
||||
v.Flush()
|
||||
|
||||
v.Lock()
|
||||
defer v.Unlock()
|
||||
|
||||
v.buffer.Release()
|
||||
v.buffer = nil
|
||||
v.writer = nil
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package bufio_test
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"testing"
|
||||
|
||||
"v2ray.com/core/common/buf"
|
||||
. "v2ray.com/core/common/bufio"
|
||||
"v2ray.com/core/testing/assert"
|
||||
)
|
||||
|
||||
func TestBufferedWriter(t *testing.T) {
|
||||
assert := assert.On(t)
|
||||
|
||||
content := buf.New()
|
||||
|
||||
writer := NewWriter(content)
|
||||
assert.Bool(writer.Cached()).IsTrue()
|
||||
|
||||
payload := make([]byte, 16)
|
||||
|
||||
nBytes, err := writer.Write(payload)
|
||||
assert.Int(nBytes).Equals(16)
|
||||
assert.Error(err).IsNil()
|
||||
|
||||
assert.Bool(content.IsEmpty()).IsTrue()
|
||||
|
||||
writer.SetCached(false)
|
||||
assert.Int(content.Len()).Equals(16)
|
||||
}
|
||||
|
||||
func TestBufferedWriterLargePayload(t *testing.T) {
|
||||
assert := assert.On(t)
|
||||
|
||||
content := buf.NewLocal(128 * 1024)
|
||||
|
||||
writer := NewWriter(content)
|
||||
assert.Bool(writer.Cached()).IsTrue()
|
||||
|
||||
payload := make([]byte, 64*1024)
|
||||
rand.Read(payload)
|
||||
|
||||
nBytes, err := writer.Write(payload[:1024])
|
||||
assert.Int(nBytes).Equals(1024)
|
||||
assert.Error(err).IsNil()
|
||||
|
||||
assert.Bool(content.IsEmpty()).IsTrue()
|
||||
|
||||
nBytes, err = writer.Write(payload[1024:])
|
||||
assert.Error(err).IsNil()
|
||||
assert.Int(nBytes).Equals(63 * 1024)
|
||||
assert.Bytes(content.Bytes()).Equals(payload)
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
// Package bufio is a replacement of the standard golang package bufio.
|
||||
package bufio
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"io"
|
||||
)
|
||||
|
||||
func OriginalReader(reader io.Reader) *bufio.Reader {
|
||||
return bufio.NewReader(reader)
|
||||
}
|
||||
|
||||
func OriginalReaderSize(reader io.Reader, size int) *bufio.Reader {
|
||||
return bufio.NewReaderSize(reader, size)
|
||||
}
|
||||
Reference in new issue
Block a user