1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-03 06:30:42 +00:00

rename buffer size

This commit is contained in:
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

View File

@ -40,12 +40,12 @@ func (this *Config) GetSendingInFlightSize() uint32 {
return size
}
func (this *Config) GetSendingWindowSize() uint32 {
return this.GetSendingInFlightSize() * 4
}
func (this *Config) GetSendingQueueSize() uint32 {
return this.WriteBuffer / this.Mtu
func (this *Config) GetSendingBufferSize() uint32 {
size := this.WriteBuffer / this.Mtu
if size < this.GetSendingInFlightSize() {
size = this.GetSendingInFlightSize()
}
return size
}
func (this *Config) GetReceivingWindowSize() uint32 {
@ -56,8 +56,16 @@ func (this *Config) GetReceivingWindowSize() uint32 {
return size
}
func (this *Config) GetReceivingQueueSize() uint32 {
return this.ReadBuffer / this.Mtu
func (this *Config) GetReceivingBufferSize() uint32 {
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 {

View File

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

View File

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