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

refine locks in sending worker

pull/215/head
v2ray 2016-07-06 16:36:15 +02:00
parent 5448ec1fe4
commit a615afc906
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,6 +255,10 @@ func (this *SendingWorker) ProcessReceivingNext(nextNumber uint32) {
this.Lock() this.Lock()
defer this.Unlock() defer this.Unlock()
this.ProcessReceivingNextWithoutLock(nextNumber)
}
func (this *SendingWorker) ProcessReceivingNextWithoutLock(nextNumber uint32) {
this.window.Clear(nextNumber) this.window.Clear(nextNumber)
this.FindFirstUnacknowledged() this.FindFirstUnacknowledged()
} }
@ -272,22 +276,24 @@ func (this *SendingWorker) FindFirstUnacknowledged() {
} }
} }
// @Private
func (this *SendingWorker) ProcessAck(number uint32) { func (this *SendingWorker) ProcessAck(number uint32) {
if number-this.firstUnacknowledged > this.window.Size() { if number-this.firstUnacknowledged > this.window.Size() {
return return
} }
this.Lock()
defer this.Unlock()
this.window.Remove(number - this.firstUnacknowledged) this.window.Remove(number - this.firstUnacknowledged)
this.FindFirstUnacknowledged() this.FindFirstUnacknowledged()
} }
func (this *SendingWorker) ProcessSegment(current uint32, seg *AckSegment) { func (this *SendingWorker) ProcessSegment(current uint32, seg *AckSegment) {
this.Lock()
defer this.Unlock()
if this.remoteNextNumber < seg.ReceivingWindow { if this.remoteNextNumber < seg.ReceivingWindow {
this.remoteNextNumber = seg.ReceivingWindow this.remoteNextNumber = seg.ReceivingWindow
} }
this.ProcessReceivingNext(seg.ReceivingNext) this.ProcessReceivingNextWithoutLock(seg.ReceivingNext)
var maxack uint32 var maxack uint32
for i := 0; i < int(seg.Count); i++ { for i := 0; i < int(seg.Count); i++ {
timestamp := seg.TimestampList[i] timestamp := seg.TimestampList[i]
@ -300,9 +306,8 @@ func (this *SendingWorker) ProcessSegment(current uint32, seg *AckSegment) {
maxack = number maxack = number
} }
} }
this.Lock()
this.window.HandleFastAck(maxack) this.window.HandleFastAck(maxack)
this.Unlock()
} }
func (this *SendingWorker) Push(b []byte) int { func (this *SendingWorker) Push(b []byte) int {
@ -325,6 +330,7 @@ func (this *SendingWorker) Push(b []byte) int {
return nBytes return nBytes
} }
// @Private
func (this *SendingWorker) Write(seg Segment) { func (this *SendingWorker) Write(seg Segment) {
dataSeg := seg.(*DataSegment) dataSeg := seg.(*DataSegment)