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

busy wait on writing

Browse Source
This commit is contained in:
v2ray 2016-05-08 19:04:51 -07:00
parent b5f43031d4
commit 663b9c9bbc
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
transport/ray/direct.go
View File

@ -1,8 +1,10 @@
package ray package ray
import ( import (
"errors"
"io" "io"
"sync" "sync"
"time"
"github.com/v2ray/v2ray-core/common/alloc" "github.com/v2ray/v2ray-core/common/alloc"
) )
@ -11,6 +13,10 @@ const (
bufferSize = 128 bufferSize = 128
) )
var (
ErrorIOTimeout = errors.New("IO Timeout")
)
// NewRay creates a new Ray for direct traffic transport. // NewRay creates a new Ray for direct traffic transport.
func NewRay() Ray { func NewRay() Ray {
return &directRay{ return &directRay{
@ -74,13 +80,26 @@ func (this *Stream) Write(data *alloc.Buffer) error {
if this.closed { if this.closed {
return io.EOF return io.EOF
} }
for {
err := this.TryWriteOnce(data)
if err != ErrorIOTimeout {
return err
}
}
}
func (this *Stream) TryWriteOnce(data *alloc.Buffer) error {
this.access.RLock() this.access.RLock()
defer this.access.RUnlock() defer this.access.RUnlock()
if this.closed { if this.closed {
return io.EOF return io.EOF
} }
this.buffer <- data select {
case this.buffer <- data:
return nil return nil
case <-time.Tick(time.Second):
return ErrorIOTimeout
}
} }
func (this *Stream) Close() { func (this *Stream) Close() {