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

rename buffer size

pull/255/head
Darien Raymond 2016-08-24 23:54:39 +02:00
parent 2839ce7a88
commit 2ae8e5d033
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
transport/internet/kcp/config.go
View File

@ -40,12 +40,12 @@ func (this *Config) GetSendingInFlightSize() uint32 {
return size return size
} }
func (this *Config) GetSendingWindowSize() uint32 { func (this *Config) GetSendingBufferSize() uint32 {
return this.GetSendingInFlightSize() * 4 size := this.WriteBuffer / this.Mtu
} if size < this.GetSendingInFlightSize() {
size = this.GetSendingInFlightSize()
func (this *Config) GetSendingQueueSize() uint32 { }
return this.WriteBuffer / this.Mtu return size
} }
func (this *Config) GetReceivingWindowSize() uint32 { func (this *Config) GetReceivingWindowSize() uint32 {
@ -56,8 +56,16 @@ func (this *Config) GetReceivingWindowSize() uint32 {
return size return size
} }
func (this *Config) GetReceivingQueueSize() uint32 { func (this *Config) GetReceivingBufferSize() uint32 {
return this.ReadBuffer / this.Mtu bufferSize := this.ReadBuffer / this.Mtu
windowSize := this.DownlinkCapacity * 1024 * 1024 / this.Mtu / (1000 / this.Tti) / 2
if windowSize < 8 {
windowSize = 8
}
if bufferSize < windowSize {
bufferSize = windowSize
}
return bufferSize
} }
func DefaultConfig() Config { func DefaultConfig() Config {

2
transport/internet/kcp/receiving.go
View File

@ -123,7 +123,7 @@ type ReceivingWorker struct {
} }
func NewReceivingWorker(kcp *Connection) *ReceivingWorker { func NewReceivingWorker(kcp *Connection) *ReceivingWorker {
windowSize := effectiveConfig.GetReceivingQueueSize() windowSize := effectiveConfig.GetReceivingBufferSize()
worker := &ReceivingWorker{ worker := &ReceivingWorker{
conn: kcp, conn: kcp,
window: NewReceivingWindow(windowSize), window: NewReceivingWindow(windowSize),

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

@ -195,7 +195,7 @@ func NewSendingWorker(kcp *Connection) *SendingWorker {
remoteNextNumber: 32, remoteNextNumber: 32,
controlWindow: effectiveConfig.GetSendingInFlightSize(), controlWindow: effectiveConfig.GetSendingInFlightSize(),
} }
worker.window = NewSendingWindow(effectiveConfig.GetSendingQueueSize(), worker, worker.OnPacketLoss) worker.window = NewSendingWindow(effectiveConfig.GetSendingBufferSize(), worker, worker.OnPacketLoss)
return worker return worker
} }