cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-25 20:41:36 +00:00
Code Releases Activity

move where the queue size check before dropping would occur

Browse Source
This commit is contained in:
Arceliar 2020-05-17 07:21:09 -05:00
parent 62b9fab5f8
commit 527d443916
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/yggdrasil/packetqueue.go
View File

@ -55,11 +55,6 @@ func (q *packetQueue) drop() bool {
} }
// Drop the oldest packet from the worst stream // Drop the oldest packet from the worst stream
packet := worstStream.infos[0].packet packet := worstStream.infos[0].packet
if false && q.size-uint64(len(packet)) < streamMsgSize {
// TODO something better
// We don't want to drop *all* packets, so lets save 1 batch worth...
return false
}
worstStream.infos = worstStream.infos[1:] worstStream.infos = worstStream.infos[1:]
worstStream.size -= uint64(len(packet)) worstStream.size -= uint64(len(packet))
q.size -= uint64(len(packet)) q.size -= uint64(len(packet))

1
src/yggdrasil/peer.go
View File

@ -310,6 +310,7 @@ func (p *peer) dropFromQueue(from phony.Actor, seq uint64) {
p.Act(from, func() { p.Act(from, func() {
switch { switch {
case seq != p.seq: case seq != p.seq:
//case p.queue.size < streamMsgSize:
case p.queue.drop(): case p.queue.drop():
p.core.log.Debugln("DEBUG dropped:", p.port, p.queue.size) p.core.log.Debugln("DEBUG dropped:", p.port, p.queue.size)
p.intf.notifyQueued(p.seq) p.intf.notifyQueued(p.seq)