comments

common/bufio/bufio.go

@@ -6,10 +6,12 @@ import (
 	"io"
 )
 
+// OriginalReader invokes bufio.NewReader() from Golang standard library.
 func OriginalReader(reader io.Reader) *bufio.Reader {
 	return bufio.NewReader(reader)
 }
 
+// OriginalReaderSize invokes bufio.NewReaderSize() from Golang standard library.
 func OriginalReaderSize(reader io.Reader, size int) *bufio.Reader {
 	return bufio.NewReaderSize(reader, size)
 }

common/bufio/reader.go

@@ -4,9 +4,11 @@ import (
 	"io"
 	"sync"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 )
 
+// BufferedReader is a reader with internal cache.
 type BufferedReader struct {
 	sync.Mutex
 	reader io.Reader
@@ -14,6 +16,7 @@ type BufferedReader struct {
 	cached bool
 }
 
+// NewReader creates a new BufferedReader based on an io.Reader.
 func NewReader(rawReader io.Reader) *BufferedReader {
 	return &BufferedReader{
 		reader: rawReader,
@@ -22,23 +25,31 @@ func NewReader(rawReader io.Reader) *BufferedReader {
 	}
 }
 
+// Release implements Releasable.Release().
 func (v *BufferedReader) Release() {
 	v.Lock()
 	defer v.Unlock()
 
 	v.buffer.Release()
 	v.buffer = nil
+	if releasable, ok := v.reader.(common.Releasable); ok {
+		releasable.Release()
+	}
 	v.reader = nil
 }
 
+// Cached returns true if the internal cache is effective.
 func (v *BufferedReader) Cached() bool {
 	return v.cached
 }
 
+// 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
 }
 
+// Read implements io.Reader.Read().
 func (v *BufferedReader) Read(b []byte) (int, error) {
 	v.Lock()
 	defer v.Unlock()

common/bufio/writer.go

@@ -4,6 +4,7 @@ import (
 	"io"
 	"sync"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/errors"
 )
@@ -117,5 +118,9 @@ func (v *BufferedWriter) Release() {
 
 	v.buffer.Release()
 	v.buffer = nil
+
+	if releasable, ok := v.writer.(common.Releasable); ok {
+		releasable.Release()
+	}
 	v.writer = nil
 }