TheArchive/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2024-11-27 12:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

use heap.Fix instead of heap.Remove + heap.Push when updating queues, this is theoretically faster

Browse Source
This commit is contained in:
Arceliar 2020-05-25 20:09:57 -05:00
parent 1f65ffb310
commit 09f9f4e8e4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/yggdrasil/packetqueue.go
View File

@ -38,12 +38,16 @@ func (q *packetQueue) drop() bool {
longestIdx = idx longestIdx = idx
} }
} }
stream := heap.Remove(q, longestIdx).(pqStream) stream := q.streams[longestIdx]
info := stream.infos[0] info := stream.infos[0]
if len(stream.infos) > 1 { if len(stream.infos) > 1 {
stream.infos = stream.infos[1:] stream.infos = stream.infos[1:]
stream.size -= uint64(len(info.packet)) stream.size -= uint64(len(info.packet))
heap.Push(q, stream) q.streams[longestIdx] = stream
q.size -= uint64(len(info.packet))
heap.Fix(q, longestIdx)
} else {
heap.Remove(q, longestIdx)
} }
pool_putBytes(info.packet) pool_putBytes(info.packet)
return true return true
@ -67,12 +71,16 @@ func (q *packetQueue) push(packet []byte) {
func (q *packetQueue) pop() ([]byte, bool) { func (q *packetQueue) pop() ([]byte, bool) {
if q.size > 0 { if q.size > 0 {
stream := heap.Pop(q).(pqStream) stream := q.streams[0]
info := stream.infos[0] info := stream.infos[0]
if len(stream.infos) > 1 { if len(stream.infos) > 1 {
stream.infos = stream.infos[1:] stream.infos = stream.infos[1:]
stream.size -= uint64(len(info.packet)) stream.size -= uint64(len(info.packet))
heap.Push(q, stream) q.streams[0] = stream
q.size -= uint64(len(info.packet))
heap.Fix(q, 0)
} else {
heap.Remove(q, 0)
} }
return info.packet, true return info.packet, true
} }