lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-27 09:55:22 +00:00
Code Issues Releases Wiki Activity

pool for data and ack segments

Browse Source
This commit is contained in:
Darien Raymond 2018-07-08 23:03:00 +02:00
parent bd4752a6ab
commit f8e6927581
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,7 @@ func (l *AckList) Flush(current uint32, rto uint32) {
l.dirty = false
}
}
if l.dirty || !seg.IsEmpty() {
for _, number := range l.flushCandidates {
if seg.IsFull() {
@ -121,9 +122,10 @@ func (l *AckList) Flush(current uint32, rto uint32) {
seg.PutNumber(number)
}
l.writer.Write(seg)
seg.Release()
l.dirty = false
}
seg.Release()
}
type ReceivingWorker struct {
@ -234,6 +236,7 @@ func (w *ReceivingWorker) Write(seg Segment) error {
ackSeg.Conv = w.conn.meta.Conversation
ackSeg.ReceivingNext = w.nextNumber
ackSeg.ReceivingWindow = w.nextNumber + w.windowSize
ackSeg.Option = 0
if w.conn.State() == StateReadyToClose {
ackSeg.Option = SegmentOptionClose
}

31
transport/internet/kcp/segment.go
View File

@ -1,6 +1,8 @@
package kcp
import (
"sync"
"v2ray.com/core/common/buf"
"v2ray.com/core/common/serial"
)
@ -38,6 +40,12 @@ const (
DataSegmentOverhead = 18
)
var dataSegmentPool = sync.Pool{
New: func() interface{} {
return new(DataSegment)
},
}
type DataSegment struct {
Conv uint16
Option SegmentOption
@ -51,7 +59,11 @@ type DataSegment struct {
}
func NewDataSegment() *DataSegment {
return new(DataSegment)
seg := dataSegmentPool.Get().(*DataSegment)
seg.Conv = 0
seg.timeout = 0
seg.transmit = 0
return seg
}
func (s *DataSegment) parse(conv uint16, cmd Command, opt SegmentOption, buf []byte) (bool, []byte) {
@ -123,6 +135,15 @@ func (s *DataSegment) ByteSize() int32 {
func (s *DataSegment) Release() {
s.payload.Release()
s.payload = nil
dataSegmentPool.Put(s)
}
var ackSegmentPool = sync.Pool{
New: func() interface{} {
return &AckSegment{
NumberList: make([]uint32, 0, 16),
}
},
}
type AckSegment struct {
@ -137,9 +158,9 @@ type AckSegment struct {
const ackNumberLimit = 128
func NewAckSegment() *AckSegment {
return &AckSegment{
NumberList: make([]uint32, 0, ackNumberLimit),
}
seg := ackSegmentPool.Get().(*AckSegment)
seg.NumberList = seg.NumberList[:0]
return seg
}
func (s *AckSegment) parse(conv uint16, cmd Command, opt SegmentOption, buf []byte) (bool, []byte) {
@ -219,7 +240,7 @@ func (s *AckSegment) Bytes() buf.Supplier {
}
func (s *AckSegment) Release() {
s.NumberList = nil
ackSegmentPool.Put(s)
}
type CmdOnlySegment struct {