Changeset 7441 for trunk/libtransmission/peer-mgr.c

Timestamp:

Dec 20, 2008, 10:19:34 PM (12 years ago)

Author:

charles

Message:

try to rework the bandwidth code yet again s.t. it satisfies all three: (1) fairly distributes bandwidth across all peers, (2) scales well in high-bandwidth situations, (3) is good at hitting and staying at bandwidth limits/goals

File:

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

trunk/libtransmission/peer-mgr.c

@@ -58 +58 @@
    
     /* how frequently to reallocate bandwidth */
-    BANDWIDTH_PERIOD_MSEC = 100,
+    BANDWIDTH_PERIOD_MSEC = 500,
 
     /* max # of peers to ask fer per torrent per reconnect pulse */
@@ -144 +144 @@
     tr_ptrArray     * torrents; /* Torrent */
     tr_ptrArray     * incomingHandshakes; /* tr_handshake */
+    tr_ptrArray     * finishedHandshakes; /* tr_handshake */
     tr_timer        * bandwidthTimer;
 };
@@ -464 +465 @@
     m->torrents = tr_ptrArrayNew( );
     m->incomingHandshakes = tr_ptrArrayNew( );
+    m->finishedHandshakes = tr_ptrArrayNew( );
     m->bandwidthTimer = tr_timerNew( session, bandwidthPulse, m, BANDWIDTH_PERIOD_MSEC );
     return m;
@@ -471 +473 @@
 tr_peerMgrFree( tr_peerMgr * manager )
 {
+    tr_handshake * handshake;
+
     managerLock( manager );
 
@@ -481 +485 @@
 
     tr_ptrArrayFree( manager->incomingHandshakes, NULL );
+
+    while(( handshake = tr_ptrArrayPop( manager->finishedHandshakes )))
+        tr_handshakeFree( handshake );
+
+    tr_ptrArrayFree( manager->finishedHandshakes, NULL );
 
     /* free the torrents. */
@@ -1195 +1204 @@
 /* FIXME: this is kind of a mess. */
 static tr_bool
-myHandshakeDoneCB( tr_handshake *  handshake,
-                   tr_peerIo *     io,
+myHandshakeDoneCB( tr_handshake  *  handshake,
+                   tr_peerIo     * io,
                    int             isConnected,
                    const uint8_t * peer_id,
-                   void *          vmanager )
+                   void          * vmanager )
 {
     tr_bool            ok = isConnected;
@@ -1241 +1250 @@
                 ++atom->numFails;
         }
-
-        tr_peerIoFree( io );
     }
     else /* looking good */
@@ -1256 +1263 @@
             tordbg( t, "banned peer %s tried to reconnect",
                     tr_peerIoAddrStr( &atom->addr, atom->port ) );
-            tr_peerIoFree( io );
         }
         else if( tr_peerIoIsIncoming( io )
@@ -1262 +1268 @@
 
         {
-            tr_peerIoFree( io );
         }
         else
@@ -1270 +1275 @@
             if( peer ) /* we already have this peer */
             {
-                tr_peerIoFree( io );
             }
             else
@@ -1286 +1290 @@
 
                 peer->port = port;
-                peer->io = io;
+                peer->io = tr_handshakeStealIO( handshake );
                 tr_peerMsgsNew( t->tor, peer, peerCallbackFunc, t, &peer->msgsTag );
                 tr_peerIoSetBandwidth( io, peer->bandwidth );
@@ -1294 +1298 @@
         }
     }
+
+    if( !success )
+        tr_ptrArrayAppend( manager->finishedHandshakes, handshake );
 
     if( t )
@@ -1545 +1552 @@
         }
 
-#warning this for loop can be removed when we are sure the bug is fixed
-        for( i=0; i<peersReturning; ++i )
-            assert( tr_isAddress( &pex[i].addr ) );
-
         assert( ( walk - pex ) == peersReturning );
         qsort( pex, peersReturning, sizeof( tr_pex ), tr_pexCompare );
-
-#warning this for loop can be removed when we are sure the bug is fixed
-        for( i=0; i<peersReturning; ++i )
-            assert( tr_isAddress( &pex[i].addr ) );
 
         *setme_pex = pex;
@@ -2395 +2394 @@
 bandwidthPulse( void * vmgr )
 {
+    tr_handshake * handshake;
     tr_peerMgr * mgr = vmgr;
     managerLock( mgr );
 
+    /* FIXME: this next line probably isn't necessary... */
     pumpAllPeers( mgr );
+
+    /* allocate bandwidth to the peers */
     tr_bandwidthAllocate( mgr->session->bandwidth, TR_UP, BANDWIDTH_PERIOD_MSEC );
     tr_bandwidthAllocate( mgr->session->bandwidth, TR_DOWN, BANDWIDTH_PERIOD_MSEC );
-    pumpAllPeers( mgr );
+
+    /* free all the finished handshakes */
+    while(( handshake = tr_ptrArrayPop( mgr->finishedHandshakes )))
+        tr_handshakeFree( handshake );
 
     managerUnlock( mgr );