Ditch the use of generic slices.HeapInterface for finding the worst "bad" connection
It's become a bottleneck. Implement it directly using heap.Interface.
This commit is contained in:
parent
a49e133d8a
commit
95f73db7e4
|
@ -779,9 +779,9 @@ func (t *Torrent) extentPieces(off, _len int64) (pieces []int) {
|
|||
// pieces, or has been in worser half of the established connections for more
|
||||
// than a minute.
|
||||
func (t *Torrent) worstBadConn() *connection {
|
||||
wcs := slices.HeapInterface(t.worstUnclosedConns(), worseConn)
|
||||
wcs := worseConnSlice{t.worstUnclosedConns()}
|
||||
for wcs.Len() != 0 {
|
||||
c := heap.Pop(wcs).(*connection)
|
||||
c := heap.Pop(&wcs).(*connection)
|
||||
if c.UnwantedChunksReceived >= 6 && c.UnwantedChunksReceived > c.UsefulChunksReceived {
|
||||
return c
|
||||
}
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
package torrent
|
||||
|
||||
import "container/heap"
|
||||
|
||||
func worseConn(l, r *connection) bool {
|
||||
if l.useful() != r.useful() {
|
||||
return r.useful()
|
||||
|
@ -9,3 +11,32 @@ func worseConn(l, r *connection) bool {
|
|||
}
|
||||
return l.completedHandshake.Before(r.completedHandshake)
|
||||
}
|
||||
|
||||
type worseConnSlice struct {
|
||||
conns []*connection
|
||||
}
|
||||
|
||||
var _ heap.Interface = &worseConnSlice{}
|
||||
|
||||
func (me worseConnSlice) Len() int {
|
||||
return len(me.conns)
|
||||
}
|
||||
|
||||
func (me worseConnSlice) Less(i, j int) bool {
|
||||
return worseConn(me.conns[i], me.conns[j])
|
||||
}
|
||||
|
||||
func (me *worseConnSlice) Pop() interface{} {
|
||||
i := len(me.conns) - 1
|
||||
ret := me.conns[i]
|
||||
me.conns = me.conns[:i]
|
||||
return ret
|
||||
}
|
||||
|
||||
func (me *worseConnSlice) Push(x interface{}) {
|
||||
me.conns = append(me.conns, x.(*connection))
|
||||
}
|
||||
|
||||
func (me worseConnSlice) Swap(i, j int) {
|
||||
me.conns[i], me.conns[j] = me.conns[j], me.conns[i]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue