Changeset 7646

Timestamp:

Jan 9, 2009, 3:45:44 PM (12 years ago)

Author:

charles

Message:

(trunk libT) finally get around to making upload-slots-per-torrent a settings.json option, thanks to friendly prodding from ful in #transmission

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (3 diffs)
• session.c (modified) (3 diffs)
• session.h (modified) (1 diff)
• transmission.h (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -67 +67 @@
     * this throttle is to avoid overloading the router */
     MAX_CONNECTIONS_PER_SECOND = 32,
-
-    /* number of unchoked peers per torrent.
-     * FIXME: this probably ought to be configurable */
-    MAX_UNCHOKED_PEERS = 14,
 
     /* number of bad pieces a peer is allowed to send before we ban them */
@@ -1933 +1929 @@
     tr_peer ** peers = (tr_peer**) tr_ptrArrayBase( &t->peers );
     struct ChokeData * choke = tr_new0( struct ChokeData, peerCount );
+    const tr_session * session = t->manager->session;
     const int chokeAll = !tr_torrentIsPieceTransferAllowed( t->tor, TR_CLIENT_TO_PEER );
     const uint64_t now = tr_date( );
@@ -1982 +1979 @@
      */
     unchokedInterested = 0;
-    for( i=0; i<size && unchokedInterested<MAX_UNCHOKED_PEERS; ++i ) {
+    for( i=0; i<size && unchokedInterested<session->uploadSlotsPerTorrent; ++i ) {
         choke[i].doUnchoke = 1;
         if( choke[i].isInterested )

trunk/libtransmission/session.c

@@ -254 +254 @@
     tr_bencDictAddInt( d, TR_PREFS_KEY_USPEED,                   100 );
     tr_bencDictAddInt( d, TR_PREFS_KEY_USPEED_ENABLED,           0 );
+    tr_bencDictAddInt( d, TR_PREFS_KEY_UPLOAD_SLOTS_PER_TORRENT, 14 );
 }
 
@@ -298 +299 @@
     tr_bencDictAddInt( d, TR_PREFS_KEY_USPEED,                   tr_sessionGetSpeedLimit( s, TR_UP ) );
     tr_bencDictAddInt( d, TR_PREFS_KEY_USPEED_ENABLED,           tr_sessionIsSpeedLimitEnabled( s, TR_UP ) );
+    tr_bencDictAddInt( d, TR_PREFS_KEY_UPLOAD_SLOTS_PER_TORRENT, s->uploadSlotsPerTorrent );
 
     for( i=0; i<n; ++i )
@@ -493 +495 @@
     /** 
     **/ 
+
+    found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_UPLOAD_SLOTS_PER_TORRENT, &i );
+    assert( found );
+    session->uploadSlotsPerTorrent = i;
  
     found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_USPEED, &i )

trunk/libtransmission/session.h

@@ -77 +77 @@
     uint16_t                     openFileLimit;
 
+    int                          uploadSlotsPerTorrent;
+
     tr_port                      peerPort;
     tr_port                      randomPortLow;

trunk/libtransmission/transmission.h

@@ -156 +156 @@
 #define TR_PREFS_KEY_USPEED_ENABLED             "upload-limit-enabled"
 #define TR_PREFS_KEY_USPEED                     "upload-limit"
+#define TR_PREFS_KEY_UPLOAD_SLOTS_PER_TORRENT   "upload-slots-per-torrent"
 
 struct tr_benc;