cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-14 16:10:29 +00:00
Code Releases Activity

prioritize sending from small queues that have been blocked for a long time

Browse Source
This commit is contained in:
Arceliar 2018-07-05 23:56:37 -05:00
parent 7da4967f5e
commit 1a65c065d0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/yggdrasil/switch.go
View File

@ -640,19 +640,21 @@ func (t *switchTable) handleIdle(port switchPort, bufs *switch_buffers) bool {
return true return true
} }
var best string var best string
var bestSize uint64 var bestPriority float64
bufs.cleanup(t) bufs.cleanup(t)
now := time.Now()
for streamID, buf := range bufs.bufs { for streamID, buf := range bufs.bufs {
// Filter over the streams that this node is closer to // Filter over the streams that this node is closer to
// Keep the one with the smallest queue // Keep the one with the smallest queue
packet := buf.packets[0] packet := buf.packets[0]
coords := switch_getPacketCoords(packet.bytes) coords := switch_getPacketCoords(packet.bytes)
if (bestSize == 0 || buf.size < bestSize) && t.portIsCloser(coords, port) { priority := float64(now.Sub(packet.time)) / float64(buf.size)
if priority > bestPriority && t.portIsCloser(coords, port) {
best = streamID best = streamID
bestSize = buf.size bestPriority = priority
} }
} }
if bestSize != 0 { if bestPriority != 0 {
buf := bufs.bufs[best] buf := bufs.bufs[best]
var packet switch_packetInfo var packet switch_packetInfo
// TODO decide if this should be LIFO or FIFO // TODO decide if this should be LIFO or FIFO