Changeset 7765

Timestamp:

Jan 20, 2009, 3:47:25 PM (12 years ago)

Author:

charles

Message:

(trunk libT) better implementation of r7761 to take into account feedback from repattila in the forums

File:

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

trunk/libtransmission/peer-mgr.c

@@ -1984 +1984 @@
 ***/
 
-static int
-shouldPeerBeClosed( const Torrent * t,
-                    const tr_peer * peer,
-                    int             peerCount )
+typedef enum
+{
+    TR_CAN_KEEP,
+    TR_CAN_CLOSE,
+    TR_MUST_CLOSE,
+}
+tr_close_type_t;
+
+static tr_close_type_t
+shouldPeerBeClosed( const Torrent    * t,
+                    const tr_peer    * peer,
+                    int                peerCount )
 {
     const tr_torrent *       tor = t->tor;
@@ -1998 +2006 @@
         tordbg( t, "purging peer %s because its doPurge flag is set",
                 tr_peerIoAddrStr( &atom->addr, atom->port ) );
-        return TRUE;
+        return TR_MUST_CLOSE;
     }
 
@@ -2021 +2029 @@
             tordbg( t, "purging peer %s because we're both seeds",
                     tr_peerIoAddrStr( &atom->addr, atom->port ) );
-            return TRUE;
+            return TR_MUST_CLOSE;
         }
     }
@@ -2042 +2050 @@
             tordbg( t, "purging peer %s because it's been %d secs since we shared anything",
                        tr_peerIoAddrStr( &atom->addr, atom->port ), idleTime );
-            return TRUE;
-        }
-    }
-
-    return FALSE;
+            return TR_CAN_CLOSE;
+        }
+    }
+
+    return TR_CAN_KEEP;
 }
 
 static tr_peer **
-getPeersToClose( Torrent * t, int * setmeSize )
+getPeersToClose( Torrent * t, tr_close_type_t closeType, int * setmeSize )
 {
     int i, peerCount, outsize;
@@ -2059 +2067 @@
 
     for( i = outsize = 0; i < peerCount; ++i )
-        if( shouldPeerBeClosed( t, peers[i], peerCount ) )
+        if( shouldPeerBeClosed( t, peers[i], peerCount ) == closeType )
             ret[outsize++] = peers[i];
 
@@ -2187 +2195 @@
 }
 
+static void
+closePeer( Torrent * t, tr_peer * peer )
+{
+    struct peer_atom * atom;
+
+    assert( t != NULL );
+    assert( peer != NULL );
+
+    /* if we transferred piece data, then they might be good peers,
+       so reset their `numFails' weight to zero.  otherwise we connected
+       to them fruitlessly, so mark it as another fail */
+    atom = getExistingAtom( t, &peer->addr );
+    if( atom->piece_data_time )
+        atom->numFails = 0;
+    else
+        ++atom->numFails;
+
+    tordbg( t, "removing bad peer %s", tr_peerIoGetAddrStr( peer->io ) );
+    removePeer( t, peer );
+}
+
 static int
 reconnectPulse( void * vtorrent )
@@ -2210 +2239 @@
     else
     {
-        int i, nCandidates, nBad;
-        struct peer_atom ** candidates = getPeerCandidates( t, &nCandidates );
-        struct tr_peer ** connections = getPeersToClose( t, &nBad );
+        int i;
+        int canCloseCount;
+        int mustCloseCount;
+        int candidateCount;
         int maxCandidates;
-
-        maxCandidates = nCandidates;
+        struct tr_peer ** canClose = getPeersToClose( t, TR_CAN_CLOSE, &canCloseCount );
+        struct tr_peer ** mustClose = getPeersToClose( t, TR_MUST_CLOSE, &mustCloseCount );
+        struct peer_atom ** candidates = getPeerCandidates( t, &candidateCount );
+
+        tordbg( t, "reconnect pulse for [%s]: "
+                   "%d must-close connections, "
+                   "%d can-close connections, "
+                   "%d connection candidates, "
+                   "%d atoms, "
+                   "max per pulse is %d",
+                   t->tor->info.name,
+                   mustCloseCount,
+                   canCloseCount,
+                   candidateCount,
+                   tr_ptrArraySize( &t->pool ),
+                   MAX_RECONNECTIONS_PER_PULSE );
+
+        /* disconnect the really bad peers */
+        for( i=0; i<mustCloseCount; ++i )
+            closePeer( t, mustClose[i] );
+
+        /* decide how many peers can we try to add in this pass */
+        maxCandidates = candidateCount;
         maxCandidates = MIN( maxCandidates, MAX_RECONNECTIONS_PER_PULSE );
         maxCandidates = MIN( maxCandidates, getMaxPeerCount( t->tor ) - getPeerCount( t ) );
         maxCandidates = MIN( maxCandidates, MAX_CONNECTIONS_PER_SECOND - newConnectionsThisSecond );
 
-        //if( nBad || nCandidates )
-            tordbg( t, "reconnect pulse for [%s]: %d bad connections, "
-                    "%d connection candidates, %d atoms, max per pulse is %d",
-                    t->tor->info.name, nBad, nCandidates,
-                    tr_ptrArraySize( &t->pool ),
-                    (int)MAX_RECONNECTIONS_PER_PULSE );
-
-        /* disconnect some peers to make room for better ones.
-           if we transferred piece data, then they might be good peers,
-           so reset their `numFails' weight to zero.  otherwise we connected
-           to them fruitlessly, so mark it as another fail */
-        for( i = 0; ( i < nBad ) && ( i < maxCandidates ) ; ++i ) {
-            tr_peer * peer = connections[i];
-            struct peer_atom * atom = getExistingAtom( t, &peer->addr );
-            if( atom->piece_data_time )
-                atom->numFails = 0;
-            else
-                ++atom->numFails;
-            tordbg( t, "removing bad peer %s", tr_peerIoGetAddrStr( peer->io ) );
-            removePeer( t, peer );
-        }
-
-tordbg( t, "nCandidates is %d, MAX_RECONNECTIONS_PER_PULSE is %d, getPeerCount(t) is %d, getMaxPeerCount(t) is %d, newConnectionsThisSecond is %d, MAX_CONNECTIONS_PER_SECOND is %d",
-        (int)nCandidates, (int)MAX_RECONNECTIONS_PER_PULSE, (int)getPeerCount( t ), (int)getMaxPeerCount( t->tor ), (int)newConnectionsThisSecond, (int)MAX_CONNECTIONS_PER_SECOND );
+        /* maybe disconnect some lesser peers, if we have candidates to replace them with */
+        for( i=0; ( i<canCloseCount ) && ( i<maxCandidates ); ++i )
+            closePeer( t, canClose[i] );
+
+        tordbg( t, "candidateCount is %d, MAX_RECONNECTIONS_PER_PULSE is %d,"
+                   " getPeerCount(t) is %d, getMaxPeerCount(t) is %d, "
+                   "newConnectionsThisSecond is %d, MAX_CONNECTIONS_PER_SECOND is %d",
+                   candidateCount,
+                   MAX_RECONNECTIONS_PER_PULSE,
+                   getPeerCount( t ),
+                   getMaxPeerCount( t->tor ),
+                   newConnectionsThisSecond, MAX_CONNECTIONS_PER_SECOND );
 
         /* add some new ones */
-        for( i = 0;    ( i < nCandidates )
-           && ( i < MAX_RECONNECTIONS_PER_PULSE )
-           && ( getPeerCount( t ) < getMaxPeerCount( t->tor ) )
-           && ( newConnectionsThisSecond < MAX_CONNECTIONS_PER_SECOND ); ++i )
+        for( i=0; i<maxCandidates; ++i )
         {
-            tr_peerMgr *       mgr = t->manager;
-            struct peer_atom * atom = candidates[i];
-            tr_peerIo *        io;
+            tr_peerMgr        * mgr = t->manager;
+            struct peer_atom  * atom = candidates[i];
+            tr_peerIo         * io;
 
             tordbg( t, "Starting an OUTGOING connection with %s",
@@ -2287 +2323 @@
 
         /* cleanup */
-        tr_free( connections );
         tr_free( candidates );
+        tr_free( mustClose );
+        tr_free( canClose );
     }