Changeset 3783

Timestamp:

Nov 10, 2007, 3:13:31 PM (15 years ago)

Author:

charles

Message:

backport the rest of the "router death" fixes.

Location:

branches/0.9x

Files:

• NEWS (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (4 diffs)

branches/0.9x/NEWS

@@ -1 +1 @@
 NEWS file for Transmission <http://transmission.m0k.org/>
+
+0.93 (2007/xx/yy)
+- All Platforms:
+   + Fix "router death" bug that impaired internet use by
+     cycling through too many peer connections too quickly
+   + Fix bug that could cause good peer connections to be lost
+   + Tweak our request queue code to improve download speeds
 
 0.92 (2007/11/05)

branches/0.9x/libtransmission/peer-mgr.c

@@ -916 +916 @@
     if( !ok || !t || !t->isRunning )
     {
+        if( t ) {
+            struct peer_atom * atom = getExistingAtom( t, addr );
+            if( atom )
+                ++atom->numFails;
+        }
+
         tr_peerIoFree( io );
     }
@@ -1590 +1596 @@
 
 static int
-compareAtomByTime( const void * va, const void * vb )
+compareCandidates( const void * va, const void * vb )
 {
     const struct peer_atom * a = * (const struct peer_atom**) va;
     const struct peer_atom * b = * (const struct peer_atom**) vb;
-    if( a->time < b->time ) return -1;
-    if( a->time > b->time ) return 1;
+    int i;
+
+    if(( i = tr_compareUint16( a->numFails, b->numFails )))
+        return i;
+
+    if( a->time != b->time )
+        return a->time < b->time ? -1 : 1;
+
     return 0;
 }
@@ -1639 +1651 @@
         }
 
+        /* we're wasting our time trying to connect to this bozo. */
+        if( atom->numFails > 10 ) {
+            tordbg( t, "RECONNECT peer %d (%s) gives us nothing but failure.",
+                    i, tr_peerIoAddrStr(&atom->addr,atom->port) );
+            continue;
+        }
+
         /* if we used this peer recently, give someone else a turn */
-        minWait = 60; /* one minute */
-        maxWait = (60 * 10); /* ten minutes */
-        wait = atom->numFails * 15; /* add 15 secs to the wait interval for each consecutive failure*/
+        minWait = 10; /* ten seconds */
+        maxWait = (60 * 20); /* twenty minutes */
+        wait = atom->numFails * 30; /* add 15 secs to the wait interval for each consecutive failure*/
         if( wait < minWait ) wait = minWait;
         if( wait > maxWait ) wait = maxWait;
@@ -1654 +1673 @@
     }
 
-    qsort( ret, retCount, sizeof(struct peer_atom*), compareAtomByTime );
+    qsort( ret, retCount, sizeof(struct peer_atom*), compareCandidates );
     *setmeSize = retCount;
     return ret;