torrent.go | 4 ++-- worst_conns.go | 31 +++++++++++++++++++++++++++++++ diff --git a/torrent.go b/torrent.go index 280850bb1cf508d857296ae50eef2221c18660e6..c8514654c4751f7f00a1aad1fa467f6bb3f416e6 100644 --- a/torrent.go +++ b/torrent.go @@ -779,9 +779,9 @@ // for the longest. A bad connection is one that usually sends us unwanted // 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 } diff --git a/worst_conns.go b/worst_conns.go index 4085e0c9a8227246d579c9e86246066812707640..dbbc3c279cb5006c8d4479966a16d24a580fac22 100644 --- a/worst_conns.go +++ b/worst_conns.go @@ -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 @@ return l.lastHelpful().Before(r.lastHelpful()) } 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] +}