github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

reduce memory consumption on readOne

pull/1458/head
Darien Raymond 2018-12-03 12:40:38 +01:00
parent c5a384195a
commit 844f6937a4
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/buf/reader.go
View File

@ -8,7 +8,17 @@ import (
) )
func readOne(r io.Reader) (*Buffer, error) { func readOne(r io.Reader) (*Buffer, error) {
// Use an one-byte buffer to wait for incoming payload.
var firstByte [1]byte
nBytes, err := r.Read(firstByte[:])
if err != nil {
return nil, err
}
b := New() b := New()
if nBytes > 0 {
copy(b.Extend(int32(nBytes)), firstByte[:])
}
for i := 0; i < 64; i++ { for i := 0; i < 64; i++ {
_, err := b.ReadFrom(r) _, err := b.ReadFrom(r)
if !b.IsEmpty() { if !b.IsEmpty() {
@ -20,6 +30,7 @@ func readOne(r io.Reader) (*Buffer, error) {
} }
} }
b.Release()
return nil, newError("Reader returns too many empty payloads.") return nil, newError("Reader returns too many empty payloads.")
} }