mirror of
https://github.com/v2ray/v2ray-core.git
synced 2026-11-20 15:05:09 +00:00
remove release() pattern
This commit is contained in:
33 files changed
+17
-232
No files matched your search
+1
-12
@@ -3,7 +3,6 @@ package bufio
|
||||
import (
|
||||
"io"
|
||||
|
||||
"v2ray.com/core/common"
|
||||
"v2ray.com/core/common/buf"
|
||||
)
|
||||
|
||||
@@ -18,21 +17,11 @@ type BufferedReader struct {
|
||||
func NewReader(rawReader io.Reader) *BufferedReader {
|
||||
return &BufferedReader{
|
||||
reader: rawReader,
|
||||
buffer: buf.New(),
|
||||
buffer: buf.NewLocal(1024),
|
||||
buffered: true,
|
||||
}
|
||||
}
|
||||
|
||||
// Release implements Releasable.Release().
|
||||
func (v *BufferedReader) Release() {
|
||||
if v.buffer != nil {
|
||||
v.buffer.Release()
|
||||
v.buffer = nil
|
||||
}
|
||||
|
||||
common.Release(v.reader)
|
||||
}
|
||||
|
||||
// IsBuffered returns true if the internal cache is effective.
|
||||
func (v *BufferedReader) IsBuffered() bool {
|
||||
return v.buffered
|
||||
|
||||
+1
-15
@@ -3,7 +3,6 @@ package bufio
|
||||
import (
|
||||
"io"
|
||||
|
||||
"v2ray.com/core/common"
|
||||
"v2ray.com/core/common/buf"
|
||||
"v2ray.com/core/common/errors"
|
||||
)
|
||||
@@ -20,7 +19,7 @@ type BufferedWriter struct {
|
||||
func NewWriter(rawWriter io.Writer) *BufferedWriter {
|
||||
return &BufferedWriter{
|
||||
writer: rawWriter,
|
||||
buffer: buf.NewSmall(),
|
||||
buffer: buf.NewLocal(1024),
|
||||
buffered: true,
|
||||
}
|
||||
}
|
||||
@@ -91,16 +90,3 @@ func (v *BufferedWriter) SetBuffered(cached bool) {
|
||||
v.Flush()
|
||||
}
|
||||
}
|
||||
|
||||
// Release implements common.Releasable.Release().
|
||||
func (v *BufferedWriter) Release() {
|
||||
if !v.buffer.IsEmpty() {
|
||||
v.Flush()
|
||||
}
|
||||
|
||||
if v.buffer != nil {
|
||||
v.buffer.Release()
|
||||
v.buffer = nil
|
||||
}
|
||||
common.Release(v.writer)
|
||||
}
|
||||
@@ -40,14 +40,14 @@ func TestBufferedWriterLargePayload(t *testing.T) {
|
||||
payload := make([]byte, 64*1024)
|
||||
rand.Read(payload)
|
||||
|
||||
nBytes, err := writer.Write(payload[:1024])
|
||||
assert.Int(nBytes).Equals(1024)
|
||||
nBytes, err := writer.Write(payload[:512])
|
||||
assert.Int(nBytes).Equals(512)
|
||||
assert.Error(err).IsNil()
|
||||
|
||||
assert.Bool(content.IsEmpty()).IsTrue()
|
||||
|
||||
nBytes, err = writer.Write(payload[1024:])
|
||||
nBytes, err = writer.Write(payload[512:])
|
||||
assert.Error(err).IsNil()
|
||||
assert.Int(nBytes).Equals(63 * 1024)
|
||||
assert.Int(nBytes).Equals(64*1024 - 512)
|
||||
assert.Bytes(content.Bytes()).Equals(payload)
|
||||
}
|
||||
Reference in new issue
Block a user