Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use buffer pool for stream buffers #5

Merged
merged 1 commit into from
Sep 25, 2018
Merged

use buffer pool for stream buffers #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
"gx": {
"dvcsimport": "github.com/whyrusleeping/yamux"
},
"gxDependencies": [
{
"author": "Stebalien",
"hash": "QmUQy76yspPa3fRyY3GzXFTg9n8JVwFru6ue3KFRt4MeTw",
"name": "go-buffer-pool",
"version": "0.1.1"
}
],
"gxVersion": "0.10.0",
"language": "go",
"license": "",
Expand Down
31 changes: 9 additions & 22 deletions stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"sync"
"sync/atomic"
"time"

"github.com/libp2p/go-buffer-pool"
)

type streamState int
Expand Down Expand Up @@ -33,8 +35,8 @@ type Stream struct {
state streamState
stateLock sync.Mutex

recvBuf *bytes.Buffer
recvLock sync.Mutex
recvBuf pool.Buffer

controlHdr header
controlErr chan error
Expand Down Expand Up @@ -92,7 +94,7 @@ START:
fallthrough
case streamClosed:
s.recvLock.Lock()
if s.recvBuf == nil || s.recvBuf.Len() == 0 {
if s.recvBuf.Len() == 0 {
s.recvLock.Unlock()
s.stateLock.Unlock()
return 0, io.EOF
Expand All @@ -106,7 +108,7 @@ START:

// If there is no data available, block
s.recvLock.Lock()
if s.recvBuf == nil || s.recvBuf.Len() == 0 {
if s.recvBuf.Len() == 0 {
s.recvLock.Unlock()
goto WAIT
}
Expand Down Expand Up @@ -239,12 +241,8 @@ func (s *Stream) sendWindowUpdate() error {

// Determine the delta update
max := s.session.config.MaxStreamWindowSize
var bufLen uint32
s.recvLock.Lock()
if s.recvBuf != nil {
bufLen = uint32(s.recvBuf.Len())
}
delta := (max - bufLen) - s.recvWindow
delta := (max - uint32(s.recvBuf.Len())) - s.recvWindow

// Determine the flags if any
flags := s.sendFlags()
Expand Down Expand Up @@ -446,12 +444,8 @@ func (s *Stream) readData(hdr header, flags uint16, conn io.Reader) error {
return ErrRecvWindowExceeded
}

if s.recvBuf == nil {
// Allocate the receive buffer just-in-time to fit the full data frame.
// This way we can read in the whole packet without further allocations.
s.recvBuf = bytes.NewBuffer(make([]byte, 0, length))
}
if _, err := io.Copy(s.recvBuf, conn); err != nil {
s.recvBuf.Grow(int(length))
if _, err := io.Copy(&s.recvBuf, conn); err != nil {
s.session.logger.Printf("[ERR] yamux: Failed to read stream data: %v", err)
s.recvLock.Unlock()
return err
Expand Down Expand Up @@ -489,13 +483,6 @@ func (s *Stream) SetWriteDeadline(t time.Time) error {
return nil
}

// Shrink is used to compact the amount of buffers utilized
// This is useful when using Yamux in a connection pool to reduce
// the idle memory utilization.
// Shrink is a no-op. The internal buffer automatically shrinks itself.
func (s *Stream) Shrink() {
s.recvLock.Lock()
if s.recvBuf != nil && s.recvBuf.Len() == 0 {
s.recvBuf = nil
}
s.recvLock.Unlock()
}