A few adjustments to prioritized peers usage

diff --git a/client.go b/client.go
index a07e3daca977101a7ae52bdedb669b7052ad4908..8985e1a02f3632cdc792a038b8f960ae527405e4 100644 (file)
--- a/client.go
+++ b/client.go
@@ -943,7 +943,7 @@ func (cl *Client) newTorrent(ih metainfo.Hash, specStorage storage.ClientImpl) (
                cl:       cl,
                infoHash: ih,
                peers: prioritizedPeers{
-                       om: btree.New(2),
+                       om: btree.New(32),
                        getPrio: func(p Peer) peerPriority {
                                return bep40PriorityIgnoreError(cl.publicAddr(p.IP), p.addr())
                        },

diff --git a/torrent.go b/torrent.go
index bc3f2a082c1717ff33a1dde90e17cd5bb702635a..4a784300bd99c6be128d88d193a88e9ec2c969a4 100644 (file)
--- a/torrent.go
+++ b/torrent.go
@@ -258,8 +258,10 @@ func (t *Torrent) addPeer(p Peer) {
        }
        t.openNewConns()
        for t.peers.Len() > cl.config.TorrentPeersHighWater {
-               t.peers.DeleteMin()
-               torrent.Add("peers discarded", 1)
+               _, ok := t.peers.DeleteMin()
+               if ok {
+                       torrent.Add("excess reserve peers discarded", 1)
+               }
        }
 }