Changeset 3878

Timestamp:

Nov 18, 2007, 5:35:28 PM (15 years ago)

Author:

charles

Message:

back to the "router death" issue: throttle how many connections T will try to open at any one time

File:

• trunk/libtransmission/peer-mgr.c (modified) (5 diffs)

trunk/libtransmission/peer-mgr.c

@@ -75 +75 @@
 
     /* how frequently to decide which peers live and die */
-    RECONNECT_PERIOD_MSEC = (5 * 1000),
+    RECONNECT_PERIOD_MSEC = (6 * 1000),
 
     /* how frequently to refill peers' request lists */
@@ -88 +88 @@
 
     /* arbitrary */
-    MAX_CONNECTED_PEERS_PER_TORRENT = 60,
+    MAX_CONNECTED_PEERS_PER_TORRENT = 50,
 
     /* when many peers are available, keep idle ones this long */
@@ -98 +98 @@
     /* how many peers to unchoke per-torrent. */
     /* FIXME: make this user-configurable? */
-    NUM_UNCHOKED_PEERS_PER_TORRENT = 20, /* arbitrary */
+    NUM_UNCHOKED_PEERS_PER_TORRENT = 10, /* arbitrary */
 
     /* set this too high and there will be a lot of churn.
@@ -1808 +1808 @@
     else
     {
-        int i, nCandidates, nBad, nAdd;
+        int i, nCandidates, nBad;
         struct peer_atom ** candidates = getPeerCandidates( t, &nCandidates );
         struct tr_peer ** connections = getPeersToClose( t, &nBad );
-        const int peerCount = tr_ptrArraySize( t->peers );
 
         if( nBad || nCandidates )
@@ -1835 +1834 @@
 
         /* add some new ones */
-        nAdd = !peerCount ? MAX_CONNECTED_PEERS_PER_TORRENT
-                          : MAX_RECONNECTIONS_PER_PULSE;
-        for( i=0; i<nAdd && i<nCandidates && i<MAX_RECONNECTIONS_PER_PULSE; ++i )
+        for( i=0; i<nCandidates && i<MAX_RECONNECTIONS_PER_PULSE; ++i )
         {
             tr_peerMgr * mgr = t->manager;