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

Timestamp:

May 26, 2008, 12:14:35 PM (14 years ago)

Author:

charles

Message:

(libT) (1) shave a few bytes from tr_peer and tr_ratecontrol's footprints. (2) remove some dead code.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -36 +36 @@
 #include "utils.h"
 
-/**
-*** The "SWIFT" system is described by Karthik Tamilmani,
-*** Vinay Pai, and Alexander Mohr of Stony Brook University
-*** in their paper "SWIFT: A System With Incentives For Trading"
-*** http://citeseer.ist.psu.edu/tamilmani04swift.html
-***
-*** More SWIFT constants are defined in peer-mgr-private.h
-**/
-
-/**
- * Allow new peers to download this many bytes from
- * us when getting started.  This can prevent gridlock
- * with other peers using tit-for-tat algorithms
- */
-static const int SWIFT_INITIAL_CREDIT = 64 * 1024; /* 64 KiB */
-
-/**
- * We expend a fraction of our torrent's total upload speed
- * on largesse by uniformly distributing free credit to
- * all of our peers.  This too helps prevent gridlock.
- */
-static const double SWIFT_LARGESSE = 0.15; /* 15% of our UL */
-
-/**
- * How frequently to extend largesse-based credit
- */
-static const int SWIFT_PERIOD_MSEC = 5000;
-
-
 enum
 {
@@ -136 +107 @@
     tr_timer * rechokeTimer;
     tr_timer * refillTimer;
-    tr_timer * swiftTimer;
     tr_torrent * tor;
     tr_peer * optimistic; /* the optimistic peer, or NULL if none */
@@ -309 +279 @@
     tr_peer * p;
     p = tr_new0( tr_peer, 1 );
-    p->credit = SWIFT_INITIAL_CREDIT;
     p->rcToClient = tr_rcInit( );
     p->rcToPeer = tr_rcInit( );
@@ -393 +362 @@
     tr_timerFree( &t->rechokeTimer );
     tr_timerFree( &t->refillTimer );
-    tr_timerFree( &t->swiftTimer );
 
     tr_bitfieldFree( t->requested );
@@ -1236 +1204 @@
 static int reconnectPulse( void * vtorrent );
 static int rechokePulse( void * vtorrent );
-static int swiftPulse( void * vtorrent );
 
 void
@@ -1251 +1218 @@
     assert( ( t->isRunning != 0 ) == ( t->reconnectTimer != NULL ) );
     assert( ( t->isRunning != 0 ) == ( t->rechokeTimer != NULL ) );
-    assert( ( t->isRunning != 0 ) == ( t->swiftTimer != NULL ) );
 
     if( !t->isRunning )
@@ -1265 +1231 @@
                                        RECHOKE_PERIOD_MSEC );
 
-        t->swiftTimer = tr_timerNew( t->manager->handle,
-                                     swiftPulse, t,
-                                     SWIFT_PERIOD_MSEC );
-
         reconnectPulse( t );
 
         rechokePulse( t );
-
-        swiftPulse( t );
     }
 
@@ -1287 +1247 @@
     tr_timerFree( &t->rechokeTimer );
     tr_timerFree( &t->reconnectTimer );
-    tr_timerFree( &t->swiftTimer );
 
     /* disconnect the peers. */
@@ -1564 +1523 @@
 **/
 
-static double
+static int
 getWeightedRate( const tr_peer * peer, int clientIsSeed )
 {
@@ -1661 +1620 @@
 /***
 ****
-***/
-
-static int
-swiftPulse( void * vtorrent )
-{
-    Torrent * t = vtorrent;
-    torrentLock( t );
-
-    if( !tr_torrentIsSeed( t->tor ) )
-    {
-        int i;
-        int peerCount = 0;
-        int deadbeatCount = 0;
-        tr_peer ** peers = getConnectedPeers( t, &peerCount );
-        tr_peer ** deadbeats = tr_new( tr_peer*, peerCount );
-
-        const double ul_KiBsec = tr_rcRate( t->tor->upload );
-        const double ul_KiB = ul_KiBsec * (SWIFT_PERIOD_MSEC/1000.0);
-        const double ul_bytes = ul_KiB * 1024;
-        const double freeCreditTotal = ul_bytes * SWIFT_LARGESSE;
-        int freeCreditPerPeer;
-
-        for( i=0; i<peerCount; ++i ) {
-            tr_peer * peer = peers[i];
-            if( peer->credit <= 0 )
-                deadbeats[deadbeatCount++] =  peer;
-        }
-
-        freeCreditPerPeer = (int)( freeCreditTotal / deadbeatCount );
-        for( i=0; i<deadbeatCount; ++i )
-            deadbeats[i]->credit = freeCreditPerPeer;
-
-        tordbg( t, "%d deadbeats, "
-            "who are each being granted %d bytes' credit "
-            "for a total of %.1f KiB, "
-            "%d%% of the torrent's ul speed %.1f\n",
-            deadbeatCount, freeCreditPerPeer,
-            ul_KiBsec*SWIFT_LARGESSE, (int)(SWIFT_LARGESSE*100), ul_KiBsec );
-
-        tr_free( deadbeats );
-        tr_free( peers );
-    }
-
-    torrentUnlock( t );
-    return TRUE;
-}
-
-/***
-****
 ****  Life and Death
 ****
@@ -1753 +1663 @@
         /* if we have >= relaxIfFewerThan, strictness is 100%.
          * if we have zero connections, strictness is 0% */
-        const double strictness = peerCount >= relaxStrictnessIfFewerThanN
+        const float strictness = peerCount >= relaxStrictnessIfFewerThanN
             ? 1.0
-            : peerCount / (double)relaxStrictnessIfFewerThanN;
+            : peerCount / (float)relaxStrictnessIfFewerThanN;
         const int lo = MIN_UPLOAD_IDLE_SECS;
         const int hi = MAX_UPLOAD_IDLE_SECS;