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

correctly apply cwnd

pull/215/head
v2ray 2016-07-04 15:54:18 +02:00
parent d1d153acb9
commit 6ea8691a07
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
transport/internet/kcp/sending.go
View File

@ -16,13 +16,12 @@ type SendingWindow struct {
prev []uint32 prev []uint32
next []uint32 next []uint32
inFlightSize uint32
totalInFlightSize uint32 totalInFlightSize uint32
writer SegmentWriter writer SegmentWriter
onPacketLoss func(uint32) onPacketLoss func(uint32)
} }
func NewSendingWindow(size uint32, inFlightSize uint32, writer SegmentWriter, onPacketLoss func(uint32)) *SendingWindow { func NewSendingWindow(size uint32, writer SegmentWriter, onPacketLoss func(uint32)) *SendingWindow {
window := &SendingWindow{ window := &SendingWindow{
start: 0, start: 0,
cap: size, cap: size,
@ -33,7 +32,6 @@ func NewSendingWindow(size uint32, inFlightSize uint32, writer SegmentWriter, on
next: make([]uint32, size), next: make([]uint32, size),
writer: writer, writer: writer,
onPacketLoss: onPacketLoss, onPacketLoss: onPacketLoss,
inFlightSize: inFlightSize,
} }
return window return window
} }
@ -42,6 +40,14 @@ func (this *SendingWindow) Len() int {
return int(this.len) return int(this.len)
} }
func (this *SendingWindow) Size() uint32 {
return this.cap
}
func (this *SendingWindow) IsFull() bool {
return this.len == this.cap
}
func (this *SendingWindow) Push(seg *DataSegment) { func (this *SendingWindow) Push(seg *DataSegment) {
pos := (this.start + this.len) % this.cap pos := (this.start + this.len) % this.cap
this.data[pos] = seg this.data[pos] = seg
@ -114,7 +120,7 @@ func (this *SendingWindow) HandleFastAck(number uint32) {
} }
} }
func (this *SendingWindow) Flush(current uint32, resend uint32, rto uint32) { func (this *SendingWindow) Flush(current uint32, resend uint32, rto uint32, maxInFlightSize uint32) {
if this.Len() == 0 { if this.Len() == 0 {
return return
} }
@ -145,7 +151,7 @@ func (this *SendingWindow) Flush(current uint32, resend uint32, rto uint32) {
if needsend { if needsend {
this.writer.Write(segment) this.writer.Write(segment)
inFlightSize++ inFlightSize++
if inFlightSize >= this.inFlightSize { if inFlightSize >= maxInFlightSize {
break break
} }
} }
@ -224,7 +230,6 @@ type SendingWorker struct {
kcp *KCP kcp *KCP
window *SendingWindow window *SendingWindow
queue *SendingQueue queue *SendingQueue
windowSize uint32
firstUnacknowledged uint32 firstUnacknowledged uint32
nextNumber uint32 nextNumber uint32
remoteNextNumber uint32 remoteNextNumber uint32
@ -239,10 +244,9 @@ func NewSendingWorker(kcp *KCP) *SendingWorker {
queue: NewSendingQueue(effectiveConfig.GetSendingQueueSize()), queue: NewSendingQueue(effectiveConfig.GetSendingQueueSize()),
fastResend: 2, fastResend: 2,
remoteNextNumber: 32, remoteNextNumber: 32,
windowSize: effectiveConfig.GetSendingWindowSize(), controlWindow: effectiveConfig.GetSendingInFlightSize(),
controlWindow: effectiveConfig.GetSendingWindowSize(),
} }
worker.window = NewSendingWindow(effectiveConfig.GetSendingWindowSize(), effectiveConfig.GetSendingInFlightSize(), worker, worker.OnPacketLoss) worker.window = NewSendingWindow(effectiveConfig.GetSendingWindowSize(), worker, worker.OnPacketLoss)
return worker return worker
} }
@ -268,7 +272,7 @@ func (this *SendingWorker) FindFirstUnacknowledged() {
} }
func (this *SendingWorker) ProcessAck(number uint32) { func (this *SendingWorker) ProcessAck(number uint32) {
if number-this.firstUnacknowledged > this.windowSize { if number-this.firstUnacknowledged > this.window.Size() {
return return
} }
@ -350,11 +354,11 @@ func (this *SendingWorker) OnPacketLoss(lossRate uint32) {
} else if lossRate <= 5 { } else if lossRate <= 5 {
this.controlWindow += this.controlWindow / 4 this.controlWindow += this.controlWindow / 4
} }
if this.controlWindow < 4 { if this.controlWindow < 16 {
this.controlWindow = 4 this.controlWindow = 16
} }
if this.controlWindow > 2*this.windowSize { if this.controlWindow > 2*effectiveConfig.GetSendingInFlightSize() {
this.controlWindow = 2 * this.windowSize this.controlWindow = 2 * effectiveConfig.GetSendingInFlightSize()
} }
} }
@ -362,7 +366,7 @@ func (this *SendingWorker) Flush() {
this.Lock() this.Lock()
defer this.Unlock() defer this.Unlock()
cwnd := this.firstUnacknowledged + this.windowSize cwnd := this.firstUnacknowledged + effectiveConfig.GetSendingInFlightSize()
if cwnd > this.remoteNextNumber { if cwnd > this.remoteNextNumber {
cwnd = this.remoteNextNumber cwnd = this.remoteNextNumber
} }
@ -370,7 +374,7 @@ func (this *SendingWorker) Flush() {
cwnd = this.firstUnacknowledged + this.controlWindow cwnd = this.firstUnacknowledged + this.controlWindow
} }
for !this.queue.IsEmpty() && _itimediff(this.nextNumber, cwnd) < 0 { for !this.queue.IsEmpty() && !this.window.IsFull() {
seg := this.queue.Pop() seg := this.queue.Pop()
seg.Number = this.nextNumber seg.Number = this.nextNumber
seg.timeout = this.kcp.current seg.timeout = this.kcp.current
@ -380,7 +384,7 @@ func (this *SendingWorker) Flush() {
this.nextNumber++ this.nextNumber++
} }
this.window.Flush(this.kcp.current, this.kcp.fastresend, this.kcp.rx_rto) this.window.Flush(this.kcp.current, this.kcp.fastresend, this.kcp.rx_rto, cwnd)
} }
func (this *SendingWorker) CloseWrite() { func (this *SendingWorker) CloseWrite() {