Change default webseed path escaping to work for all S3-compatible providers

[btrtrc.git] / prioritized_peers.go

diff --git a/prioritized_peers.go b/prioritized_peers.go
index 4ea45919094a0fcfeb9e7bd1325463b6d8586c30..d0ef43edbb6d9bed2c89ea8f9bfbaa2152fc3a74 100644 (file)
--- a/prioritized_peers.go
+++ b/prioritized_peers.go
@@ -1,24 +1,43 @@
 package torrent
 
-import "github.com/google/btree"
+import (
+       "hash/maphash"
+
+       "github.com/anacrolix/multiless"
+       "github.com/google/btree"
+)
 
 // Peers are stored with their priority at insertion. Their priority may
 // change if our apparent IP changes, we don't currently handle that.
 type prioritizedPeersItem struct {
        prio peerPriority
-       p    Peer
+       p    PeerInfo
+}
+
+var hashSeed = maphash.MakeSeed()
+
+func (me prioritizedPeersItem) addrHash() int64 {
+       var h maphash.Hash
+       h.SetSeed(hashSeed)
+       h.WriteString(me.p.Addr.String())
+       return int64(h.Sum64())
 }
 
 func (me prioritizedPeersItem) Less(than btree.Item) bool {
-       return me.prio < than.(prioritizedPeersItem).prio
+       other := than.(prioritizedPeersItem)
+       return multiless.New().Bool(
+               me.p.Trusted, other.p.Trusted).Uint32(
+               me.prio, other.prio).Int64(
+               me.addrHash(), other.addrHash(),
+       ).Less()
 }
 
 type prioritizedPeers struct {
        om      *btree.BTree
-       getPrio func(Peer) peerPriority
+       getPrio func(PeerInfo) peerPriority
 }
 
-func (me *prioritizedPeers) Each(f func(Peer)) {
+func (me *prioritizedPeers) Each(f func(PeerInfo)) {
        me.om.Ascend(func(i btree.Item) bool {
                f(i.(prioritizedPeersItem).p)
                return true
@@ -30,14 +49,31 @@ func (me *prioritizedPeers) Len() int {
 }
 
 // Returns true if a peer is replaced.
-func (me *prioritizedPeers) Add(p Peer) bool {
+func (me *prioritizedPeers) Add(p PeerInfo) bool {
        return me.om.ReplaceOrInsert(prioritizedPeersItem{me.getPrio(p), p}) != nil
 }
 
-func (me *prioritizedPeers) DeleteMin() {
-       me.om.DeleteMin()
+// Returns true if a peer is replaced.
+func (me *prioritizedPeers) AddReturningReplacedPeer(p PeerInfo) (ret PeerInfo, ok bool) {
+       item := me.om.ReplaceOrInsert(prioritizedPeersItem{me.getPrio(p), p})
+       if item == nil {
+               return
+       }
+       ret = item.(prioritizedPeersItem).p
+       ok = true
+       return
+}
+
+func (me *prioritizedPeers) DeleteMin() (ret prioritizedPeersItem, ok bool) {
+       i := me.om.DeleteMin()
+       if i == nil {
+               return
+       }
+       ret = i.(prioritizedPeersItem)
+       ok = true
+       return
 }
 
-func (me *prioritizedPeers) PopMax() Peer {
+func (me *prioritizedPeers) PopMax() PeerInfo {
        return me.om.DeleteMax().(prioritizedPeersItem).p
 }