Changeset 3274

Timestamp:

Oct 2, 2007, 7:54:14 PM (15 years ago)

Author:

charles

Message:

tweak the peer manager code a little more.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -403 +403 @@
 }
 
-static int reconnectPulse( void * vtorrent );
-
-static void
-restartReconnectTimer( Torrent * t )
-{
-    tr_timerFree( &t->reconnectTimer );
-    if( t->isRunning )
-        t->reconnectTimer = tr_timerNew( t->manager->handle, reconnectPulse, t, RECONNECT_PERIOD_MSEC );
-}
-
-static int rechokePulse( void * vtorrent );
-
-static void
-restartChokeTimer( Torrent * t )
-{
-    tr_timerFree( &t->rechokeTimer );
-    if( t->isRunning )
-        t->rechokeTimer = tr_timerNew( t->manager->handle, rechokePulse, t, RECHOKE_PERIOD_MSEC );
-}
-
 static Torrent*
 torrentConstructor( tr_peerMgr * manager, tr_torrent * tor )
@@ -435 +415 @@
     t->outgoingHandshakes = tr_ptrArrayNew( );
     t->requested = tr_bitfieldNew( tor->blockCount );
-    restartChokeTimer( t );
-    restartReconnectTimer( t );
     memcpy( t->hash, tor->info.hash, SHA_DIGEST_LENGTH );
 
@@ -1096 +1074 @@
 }
 
+static int reconnectPulse( void * vtorrent );
+static int rechokePulse( void * vtorrent );
+
 void
 tr_peerMgrStartTorrent( tr_peerMgr     * manager,
@@ -1105 +1086 @@
 
     t = getExistingTorrent( manager, torrentHash );
+
+    assert( t != NULL );
+    assert( !t->isRunning );
+    assert( t->reconnectTimer == NULL );
+    assert( t->rechokeTimer == NULL );
+
     t->isRunning = 1;
-    restartChokeTimer( t );
-    restartReconnectTimer( t );
+    t->reconnectTimer = tr_timerNew( t->manager->handle, reconnectPulse, t, RECONNECT_PERIOD_MSEC );
+    t->rechokeTimer = tr_timerNew( t->manager->handle, rechokePulse, t, RECHOKE_PERIOD_MSEC );
 
     managerUnlock( manager );
@@ -1505 +1492 @@
         else if( peer->doPurge )
             isWeak = TRUE;
-        else if( peerIsSeed && clientIsSeed && (now-atom->time >= 30) ) /* pex time */
-            isWeak = TRUE;
+        else if( peerIsSeed && clientIsSeed )
+            isWeak = t->tor->pexDisabled || (now-atom->time>=30);
         else if( ( now - atom->time ) < LAISSEZ_FAIRE_PERIOD_SECS )
             isWeak = FALSE;
-#if 0
         else
-            isWeak = TRUE;
-#else
-        else if( now - peer->pieceDataActivityDate > 180 )
-            isWeak = TRUE;
-        else
-            isWeak = FALSE;
-#endif
+            isWeak = now - peer->pieceDataActivityDate > 180;
 
         if( isWeak )
@@ -1598 +1578 @@
     else
     {
-        int i, nCandidates, nConnections, nAdd;
+        int i, nCandidates, nWeak, nAdd;
         struct peer_atom ** candidates = getPeerCandidates( t, &nCandidates );
-        struct tr_connection * connections = getWeakConnections( t, &nConnections );
+        struct tr_connection * connections = getWeakConnections( t, &nWeak );
         const int peerCount = tr_ptrArraySize( t->peers );
 
         tordbg( t, "RECONNECT pulse for [%s]: %d weak connections, %d connection candidates, %d atoms, max per pulse is %d\n",
-                 t->tor->info.name, nConnections, nCandidates, tr_ptrArraySize(t->pool), (int)MAX_RECONNECTIONS_PER_PULSE );
-
-        for( i=0; i<nConnections; ++i )
+                 t->tor->info.name, nWeak, nCandidates, tr_ptrArraySize(t->pool), (int)MAX_RECONNECTIONS_PER_PULSE );
+
+        for( i=0; i<nWeak; ++i )
             tordbg( t, "connection #%d: %s @ %.2f\n", i+1,
                      tr_peerIoAddrStr( &connections[i].peer->in_addr, connections[i].peer->port ), connections[i].throughput );
 
         /* disconnect some peers */
-        for( i=0; i<nConnections && i<(peerCount-5) && i<MAX_RECONNECTIONS_PER_PULSE; ++i ) {
-            const double throughput = connections[i].throughput;
-            tr_peer * peer = connections[i].peer;
-            tordbg( t, "RECONNECT culling peer %s, whose throughput was %f\n",
-                       tr_peerIoAddrStr(&peer->in_addr, peer->port), throughput );
-            removePeer( t, peer );
-        }
+        for( i=0; i<nWeak; ++i )
+            removePeer( t, connections[i].peer );
 
         /* add some new ones */