Changeset 10085

Timestamp:

Feb 3, 2010, 12:12:19 AM (12 years ago)

Author:

charles

Message:

(trunk libT) taper off the number of new connections per pulse per torrent based on how long the torrent's been running. Brand-new torrents get a higher burst of new peer connection attempts, but long-running torrents don't need that kind of activity.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -61 +61 @@
     MAX_UPLOAD_IDLE_SECS = ( 60 * 5 ),
 
-    /* max # of peers to ask fer per torrent per reconnect pulse */
-    MAX_RECONNECTIONS_PER_PULSE = 8,
-
     /* max number of peers to ask for per second overall.
     * this throttle is to avoid overloading the router */
@@ -2686 +2683 @@
 }
 
+/* Make a lot of slots available to newly-running torrents...
+ * once they reach steady state, they shouldn't need as many */
+static int
+maxNewPeersPerPulse( const Torrent * t )
+{
+    double runTime;
+    const tr_torrent * tor = t->tor;
+
+    assert( tr_isTorrent( tor ) );
+
+    runTime = difftime( tr_time( ), tor->startDate );
+    if( runTime > 480 ) return 1;
+    if( runTime > 240 ) return 2;
+    if( runTime > 120 ) return 3;
+    return 4;
+}
+
 static void
 reconnectTorrent( Torrent * t )
@@ -2709 +2723 @@
         int maxCandidates;
         struct tr_peer ** mustClose;
+        const int maxPerPulse = maxNewPeersPerPulse( t );
 
         /* disconnect the really bad peers */
@@ -2717 +2732 @@
 
         /* decide how many peers can we try to add in this pass */
-        maxCandidates = MAX_RECONNECTIONS_PER_PULSE;
+    
+        maxCandidates = maxPerPulse;
         if( tr_announcerHasBacklog( t->manager->session->announcer ) )
             maxCandidates /= 2;
@@ -2731 +2747 @@
                        t->tor->info.name, mustCloseCount,
                        tr_ptrArraySize( &t->pool ),
-                       MAX_RECONNECTIONS_PER_PULSE );
-
-            tordbg( t, "maxCandidates is %d, MAX_RECONNECTIONS_PER_PULSE is %d, "
+                       maxPerPulse );
+
+            tordbg( t, "maxCandidates is %d, maxPerPulse is %d, "
                        "getPeerCount(t) is %d, getMaxPeerCount(t) is %d, "
                        "newConnectionsThisSecond is %d, MAX_CONNECTIONS_PER_SECOND is %d",
-                       maxCandidates, MAX_RECONNECTIONS_PER_PULSE,
+                       maxCandidates, maxPerPulse,
                        getPeerCount( t ), getMaxPeerCount( t->tor ),
                        newConnectionsThisSecond, MAX_CONNECTIONS_PER_SECOND );
@@ -2763 +2779 @@
                        t->tor->info.name, mustCloseCount,
                        canCloseCount, candidateCount,
-                       tr_ptrArraySize( &t->pool ), MAX_RECONNECTIONS_PER_PULSE );
-
-            tordbg( t, "candidateCount is %d, MAX_RECONNECTIONS_PER_PULSE is %d,"
+                       tr_ptrArraySize( &t->pool ), maxPerPulse );
+
+            tordbg( t, "candidateCount is %d, maxPerPulse is %d,"
                        " getPeerCount(t) is %d, getMaxPeerCount(t) is %d, "
                        "newConnectionsThisSecond is %d, MAX_CONNECTIONS_PER_SECOND is %d",
-                       candidateCount, MAX_RECONNECTIONS_PER_PULSE,
+                       candidateCount, maxPerPulse,
                        getPeerCount( t ), getMaxPeerCount( t->tor ),
                        newConnectionsThisSecond, MAX_CONNECTIONS_PER_SECOND );