mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-19 23:03:08 +00:00
rename cached to buffered
This commit is contained in:
9 files changed
+43
-40
No files matched your search
+14
-14
@@ -9,17 +9,17 @@ import (
|
||||
|
||||
// BufferedReader is a reader with internal cache.
|
||||
type BufferedReader struct {
|
||||
reader io.Reader
|
||||
buffer *buf.Buffer
|
||||
cached bool
|
||||
reader io.Reader
|
||||
buffer *buf.Buffer
|
||||
buffered bool
|
||||
}
|
||||
|
||||
// NewReader creates a new BufferedReader based on an io.Reader.
|
||||
func NewReader(rawReader io.Reader) *BufferedReader {
|
||||
return &BufferedReader{
|
||||
reader: rawReader,
|
||||
buffer: buf.New(),
|
||||
cached: true,
|
||||
reader: rawReader,
|
||||
buffer: buf.New(),
|
||||
buffered: true,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,20 +33,20 @@ func (v *BufferedReader) Release() {
|
||||
common.Release(v.reader)
|
||||
}
|
||||
|
||||
// Cached returns true if the internal cache is effective.
|
||||
func (v *BufferedReader) Cached() bool {
|
||||
return v.cached
|
||||
// IsBuffered returns true if the internal cache is effective.
|
||||
func (v *BufferedReader) IsBuffered() bool {
|
||||
return v.buffered
|
||||
}
|
||||
|
||||
// SetCached is to enable or disable internal cache. If cache is disabled,
|
||||
// Read() and Write() calls will be delegated to the underlying io.Reader directly.
|
||||
func (v *BufferedReader) SetCached(cached bool) {
|
||||
v.cached = cached
|
||||
// SetBuffered is to enable or disable internal cache. If cache is disabled,
|
||||
// Read() calls will be delegated to the underlying io.Reader directly.
|
||||
func (v *BufferedReader) SetBuffered(cached bool) {
|
||||
v.buffered = cached
|
||||
}
|
||||
|
||||
// Read implements io.Reader.Read().
|
||||
func (v *BufferedReader) Read(b []byte) (int, error) {
|
||||
if !v.cached || v.buffer == nil {
|
||||
if !v.buffered || v.buffer == nil {
|
||||
if !v.buffer.IsEmpty() {
|
||||
return v.buffer.Read(b)
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ func TestBufferedReader(t *testing.T) {
|
||||
len := content.Len()
|
||||
|
||||
reader := NewReader(content)
|
||||
assert.Bool(reader.Cached()).IsTrue()
|
||||
assert.Bool(reader.IsBuffered()).IsTrue()
|
||||
|
||||
payload := make([]byte, 16)
|
||||
|
||||
|
||||
+14
-11
@@ -8,17 +8,20 @@ import (
|
||||
"v2ray.com/core/common/errors"
|
||||
)
|
||||
|
||||
// BufferedWriter is an io.Writer with internal buffer. It writes to underlying writer when buffer is full or on demand.
|
||||
// This type is not thread safe.
|
||||
type BufferedWriter struct {
|
||||
writer io.Writer
|
||||
buffer *buf.Buffer
|
||||
cached bool
|
||||
writer io.Writer
|
||||
buffer *buf.Buffer
|
||||
buffered bool
|
||||
}
|
||||
|
||||
// NewWriter creates a new BufferedWriter.
|
||||
func NewWriter(rawWriter io.Writer) *BufferedWriter {
|
||||
return &BufferedWriter{
|
||||
writer: rawWriter,
|
||||
buffer: buf.NewSmall(),
|
||||
cached: true,
|
||||
writer: rawWriter,
|
||||
buffer: buf.NewSmall(),
|
||||
buffered: true,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +44,7 @@ func (v *BufferedWriter) ReadFrom(reader io.Reader) (int64, error) {
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) Write(b []byte) (int, error) {
|
||||
if !v.cached || v.buffer == nil {
|
||||
if !v.buffered || v.buffer == nil {
|
||||
return v.writer.Write(b)
|
||||
}
|
||||
nBytes, err := v.buffer.Write(b)
|
||||
@@ -74,12 +77,12 @@ func (v *BufferedWriter) Flush() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) Cached() bool {
|
||||
return v.cached
|
||||
func (v *BufferedWriter) Buffered() bool {
|
||||
return v.buffered
|
||||
}
|
||||
|
||||
func (v *BufferedWriter) SetCached(cached bool) {
|
||||
v.cached = cached
|
||||
func (v *BufferedWriter) SetBuffered(cached bool) {
|
||||
v.buffered = cached
|
||||
if !cached && !v.buffer.IsEmpty() {
|
||||
v.Flush()
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ func TestBufferedWriter(t *testing.T) {
|
||||
content := buf.New()
|
||||
|
||||
writer := NewWriter(content)
|
||||
assert.Bool(writer.Cached()).IsTrue()
|
||||
assert.Bool(writer.Buffered()).IsTrue()
|
||||
|
||||
payload := make([]byte, 16)
|
||||
|
||||
@@ -25,7 +25,7 @@ func TestBufferedWriter(t *testing.T) {
|
||||
|
||||
assert.Bool(content.IsEmpty()).IsTrue()
|
||||
|
||||
writer.SetCached(false)
|
||||
writer.SetBuffered(false)
|
||||
assert.Int(content.Len()).Equals(16)
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ func TestBufferedWriterLargePayload(t *testing.T) {
|
||||
content := buf.NewLocal(128 * 1024)
|
||||
|
||||
writer := NewWriter(content)
|
||||
assert.Bool(writer.Cached()).IsTrue()
|
||||
assert.Bool(writer.Buffered()).IsTrue()
|
||||
|
||||
payload := make([]byte, 64*1024)
|
||||
rand.Read(payload)
|
||||
|
||||
Reference in new issue
Block a user