lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

refactor bytes reader

Browse Source
This commit is contained in:
Darien Raymond 2017-04-19 11:52:27 +02:00
parent fccf0c2edb
commit 7e2246907b
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
common/buf/reader.go
View File

@ -36,74 +36,59 @@ func (r *readerAdpater) Read() (MultiBuffer, error) {
} }
type bufferToBytesReader struct { type bufferToBytesReader struct {
stream Reader stream Reader
current MultiBuffer leftOver MultiBuffer
err error
}
// fill fills in the internal buffer.
func (r *bufferToBytesReader) fill() {
b, err := r.stream.Read()
if err != nil {
r.err = err
return
}
r.current = b
} }
func (r *bufferToBytesReader) Read(b []byte) (int, error) { func (r *bufferToBytesReader) Read(b []byte) (int, error) {
if r.err != nil { if r.leftOver != nil {
return 0, r.err nBytes, err := r.leftOver.Read(b)
if r.leftOver.IsEmpty() {
r.leftOver.Release()
r.leftOver = nil
}
return nBytes, err
} }
if r.current == nil { mb, err := r.stream.Read()
r.fill() if err != nil {
if r.err != nil { return 0, err
return 0, r.err
}
} }
nBytes, err := r.current.Read(b)
if r.current.IsEmpty() { nBytes, err := mb.Read(b)
r.current.Release() if !mb.IsEmpty() {
r.current = nil r.leftOver = mb
} }
return nBytes, err return nBytes, err
} }
func (r *bufferToBytesReader) ReadMultiBuffer() (MultiBuffer, error) { func (r *bufferToBytesReader) ReadMultiBuffer() (MultiBuffer, error) {
if r.err != nil { if r.leftOver != nil {
return nil, r.err mb := r.leftOver
r.leftOver = nil
return mb, nil
} }
if r.current == nil {
r.fill() return r.stream.Read()
if r.err != nil {
return nil, r.err
}
}
b := r.current
r.current = nil
return b, nil
} }
func (r *bufferToBytesReader) writeToInternal(writer io.Writer) (int64, error) { func (r *bufferToBytesReader) writeToInternal(writer io.Writer) (int64, error) {
if r.err != nil {
return 0, r.err
}
mbWriter := NewWriter(writer) mbWriter := NewWriter(writer)
totalBytes := int64(0) totalBytes := int64(0)
if r.leftOver != nil {
mbWriter.Write(r.leftOver)
totalBytes += int64(r.leftOver.Len())
}
for { for {
if r.current == nil { mb, err := r.stream.Read()
r.fill() if err != nil {
if r.err != nil { return totalBytes, err
return totalBytes, r.err }
} totalBytes += int64(mb.Len())
} if err := mbWriter.Write(mb); err != nil {
totalBytes += int64(r.current.Len())
if err := mbWriter.Write(r.current); err != nil {
return totalBytes, err return totalBytes, err
} }
r.current = nil
} }
} }