58fcf809ea
* Replace mclock with time in peer pools we used mclock as golang before 1.9 did not support monotonic clocks, https://github.com/gavv/monotime, it does now https://golang.org/pkg/time/ so we can fallback on the system implementation, which will return nanoseconds with a resolution that is system dependent. * Handle case where peer have same discovered time In some system the resolution of the clock is not high enough so multiple peers are added on the same nanosecond. This result in the peer just added being immediately removed. This code adds a check making sure we don't assume that a peer is added. Another approach would be to make sure to include the peer in the list, so prevent the peer just being added to be evicted, but it's slightly more complicated and the resolution is generally accurate enough for our purpose so that peers will be fresh enough if they have the same discovered time. It also adds a regression test, I had to use an interface to stub the clock. Fixes: https://github.com/status-im/nim-status-client/issues/522 * bump version to 0.55.3
42 lines
722 B
Go
42 lines
722 B
Go
package peers
|
|
|
|
import (
|
|
"container/heap"
|
|
)
|
|
|
|
type peerInfoItem struct {
|
|
*peerInfo
|
|
index int
|
|
}
|
|
|
|
type peerPriorityQueue []*peerInfoItem
|
|
|
|
var _ heap.Interface = (*peerPriorityQueue)(nil)
|
|
|
|
func (q peerPriorityQueue) Len() int { return len(q) }
|
|
|
|
func (q peerPriorityQueue) Less(i, j int) bool {
|
|
return q[i].discoveredTime.After(q[j].discoveredTime)
|
|
}
|
|
|
|
func (q peerPriorityQueue) Swap(i, j int) {
|
|
q[i], q[j] = q[j], q[i]
|
|
q[i].index = i
|
|
q[j].index = j
|
|
}
|
|
|
|
func (q *peerPriorityQueue) Push(x interface{}) {
|
|
item := x.(*peerInfoItem)
|
|
item.index = len(*q)
|
|
*q = append(*q, item)
|
|
}
|
|
|
|
func (q *peerPriorityQueue) Pop() interface{} {
|
|
old := *q
|
|
n := len(old)
|
|
item := old[n-1]
|
|
item.index = -1
|
|
*q = old[0 : n-1]
|
|
return item
|
|
}
|