Changeset 7154 for trunk/libtransmission/torrent.c

Timestamp:

Nov 25, 2008, 9:35:17 PM (14 years ago)

Author:

charles

Message:

(libT) yet another stab at getting bandwidth management under control. this version may suck less than previous attempts. It also breaks the mac build until someone adds iobuf.[ch] to xcode...

File:

• trunk/libtransmission/torrent.c (modified) (5 diffs)

trunk/libtransmission/torrent.c

@@ -144 +144 @@
 void
 tr_torrentSetSpeedMode( tr_torrent *  tor,
-                        tr_direction  direction,
+                        tr_direction  dir,
                         tr_speedlimit mode )
 {
-    tr_speedlimit * limit = direction == TR_UP ? &tor->uploadLimitMode
-                                               : &tor->downloadLimitMode;
-
-    *limit = mode;
+    assert( tor != NULL );
+    assert( dir==TR_UP || dir==TR_DOWN );
+    assert( mode==TR_SPEEDLIMIT_GLOBAL || mode==TR_SPEEDLIMIT_SINGLE || mode==TR_SPEEDLIMIT_UNLIMITED  );
+
+    tor->speedLimitMode[dir] = mode;
+
+    tr_bandwidthSetLimited( tor->bandwidth, dir, mode==TR_SPEEDLIMIT_SINGLE );
+    tr_bandwidthHonorParentLimits( tor->bandwidth, dir, mode!=TR_SPEEDLIMIT_UNLIMITED );
 }
 
 tr_speedlimit
 tr_torrentGetSpeedMode( const tr_torrent * tor,
-                        tr_direction       direction )
-{
-    return direction == TR_UP ? tor->uploadLimitMode
-                              : tor->downloadLimitMode;
+                        tr_direction       dir )
+{
+    assert( tor != NULL );
+    assert( dir==TR_UP || dir==TR_DOWN );
+
+    return tor->speedLimitMode[dir];
 }
 
 void
 tr_torrentSetSpeedLimit( tr_torrent * tor,
-                         tr_direction direction,
-                         int          single_KiB_sec )
-{
-    switch( direction )
-    {
-        case TR_UP:
-            tor->uploadLimit = single_KiB_sec; break;
-
-        case TR_DOWN:
-            tor->downloadLimit = single_KiB_sec; break;
-
-        default:
-            assert( 0 );
-    }
+                         tr_direction dir,
+                         int          desiredSpeed )
+{
+    tr_bandwidthSetDesiredSpeed( tor->bandwidth, dir, desiredSpeed );
 }
 
 int
 tr_torrentGetSpeedLimit( const tr_torrent * tor,
-                         tr_direction       direction )
-{
-    switch( direction )
-    {
-        case TR_UP:
-            return tor->uploadLimit;
-
-        case TR_DOWN:
-            return tor->downloadLimit;
-
-        default:
-            assert( 0 );
-    }
+                         tr_direction       dir )
+{
+    return tr_bandwidthGetDesiredSpeed( tor->bandwidth, dir );
 }
 
@@ -498 +484 @@
     randomizeTiers( info );
 
-    tor->bandwidth[TR_UP] = tr_bandwidthNew( h );
-    tor->bandwidth[TR_DOWN] = tr_bandwidthNew( h );
+    tor->bandwidth = tr_bandwidthNew( h, h->bandwidth );
+
+fprintf( stderr, "torrent [%s] bandwidth is %p\n", info->name, tor->bandwidth );
 
     tor->blockSize = getBlockSize( info->pieceSize );
@@ -541 +528 @@
     tr_torrentInitFilePieces( tor );
 
-    tor->uploadLimit = 0;
-    tor->downloadLimit = 0;
     tor->swarmSpeed = tr_rcInit( );
 
@@ -814 +799 @@
                             s->peersFrom );
 
-    s->rawUploadSpeed     = tr_bandwidthGetRawSpeed  ( tor->bandwidth[TR_UP] );
-    s->rawDownloadSpeed   = tr_bandwidthGetRawSpeed  ( tor->bandwidth[TR_DOWN] );
-    s->pieceUploadSpeed   = tr_bandwidthGetPieceSpeed( tor->bandwidth[TR_UP] );
-    s->pieceDownloadSpeed = tr_bandwidthGetPieceSpeed( tor->bandwidth[TR_DOWN] );
+    s->rawUploadSpeed     = tr_bandwidthGetRawSpeed  ( tor->bandwidth, TR_UP );
+    s->rawDownloadSpeed   = tr_bandwidthGetRawSpeed  ( tor->bandwidth, TR_DOWN );
+    s->pieceUploadSpeed   = tr_bandwidthGetPieceSpeed( tor->bandwidth, TR_UP );
+    s->pieceDownloadSpeed = tr_bandwidthGetPieceSpeed( tor->bandwidth, TR_DOWN );
 
     usableSeeds += tor->info.webseedCount;
@@ -1100 +1085 @@
     h->torrentCount--;
 
-    tr_bandwidthFree( tor->bandwidth[TR_DOWN] );
-    tr_bandwidthFree( tor->bandwidth[TR_UP] );
+    tr_bandwidthFree( tor->bandwidth );
 
     tr_metainfoFree( inf );