Changeset 1320

Timestamp:

Jan 8, 2007, 9:53:55 PM (16 years ago)

Author:

livings124

Message:

global bandwidth limits only apply to transfers that are not set to overide them

Location:

trunk

Files:

• libtransmission/internal.h (modified) (2 diffs)
• libtransmission/peer.c (modified) (4 diffs)
• libtransmission/ratecontrol.c (modified) (1 diff)
• libtransmission/ratecontrol.h (modified) (1 diff)
• libtransmission/transmission.c (modified) (7 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/libtransmission/internal.h

@@ -140 +140 @@
 struct tr_torrent_s
 {
+    tr_handle_t * handle;
     tr_info_t info;
 
-    tr_ratecontrol_t * globalUpload;
-    tr_ratecontrol_t * globalDownload;
+    int                customSpeedLimit;
     tr_ratecontrol_t * upload;
     tr_ratecontrol_t * download;
@@ -202 +202 @@
     tr_torrent_t * torrentList;
 
-    tr_ratecontrol_t * upload;
-    tr_ratecontrol_t * download;
+    int            uploadLimit;
+    int            downloadLimit;
     tr_fd_t      * fdlimit;
     tr_choking_t * choking;

trunk/libtransmission/peer.c

@@ -267 +267 @@
     for( ;; )
     {
-        if( tor && (!tr_rcCanTransfer( tor->globalDownload )
-                    || !tr_rcCanTransfer( tor->download ) ) )
+        if( tor && ( ( !tor->customSpeedLimit && !tr_rcCanGlobalTransfer( tor->handle, 0 ) )
+            || ( tor->customSpeedLimit && !tr_rcCanTransfer( tor->download ) ) ) )
         {
             break;
@@ -302 +302 @@
             tr_rcTransferred( peer->download, ret );
             tr_rcTransferred( tor->download, ret );
-            tr_rcTransferred( tor->globalDownload, ret );
             if( parseBuf( tor, peer ) )
             {
@@ -438 +437 @@
         while( ( p = blockPending( tor, peer, &size ) ) )
         {
-            if( !tr_rcCanTransfer( tor->globalUpload )
-                || !tr_rcCanTransfer( tor->upload ) )
+            if( ( !tor->customSpeedLimit && !tr_rcCanGlobalTransfer( tor->handle, 1 ) )
+                    || ( tor->customSpeedLimit && !tr_rcCanTransfer( tor->upload ) ) )
             {
                 break;
@@ -457 +456 @@
             tr_rcTransferred( peer->upload, ret );
             tr_rcTransferred( tor->upload, ret );
-            tr_rcTransferred( tor->globalUpload, ret );
 
             tor->uploadedCur += ret;

trunk/libtransmission/ratecontrol.c

@@ -91 +91 @@
 }
 
+int tr_rcCanGlobalTransfer( tr_handle_t * h, int isUpload )
+{
+    tr_torrent_t * tor;
+    tr_ratecontrol_t * r;
+    float rate = 0;
+    int limit = isUpload ? h->uploadLimit : h->downloadLimit;
+    
+    if( limit < 0 )
+    {
+        return 1;
+    }
+    
+    for( tor = h->torrentList; tor && rate < (float)limit; tor = tor->next )
+    {
+        if( !tor->customSpeedLimit )
+        {
+            r = isUpload ? tor->upload : tor->download;
+            tr_lockLock( &r->lock );
+            rate += rateForInterval( r, 1000 );
+            tr_lockUnlock( &r->lock );
+        }
+    }
+    
+    return rate < (float)limit;
+}
+
 void tr_rcSetLimit( tr_ratecontrol_t * r, int limit )
 {

trunk/libtransmission/ratecontrol.h

@@ -26 +26 @@
 
 tr_ratecontrol_t * tr_rcInit();
+int                tr_rcCanGlobalTransfer( tr_handle_t * h, int isUpload );
 void               tr_rcSetLimit( tr_ratecontrol_t *, int );
 int                tr_rcCanTransfer( tr_ratecontrol_t * );

trunk/libtransmission/transmission.c

@@ -71 +71 @@
 
     /* Initialize rate and file descripts controls */
-    h->upload   = tr_rcInit();
-    h->download = tr_rcInit();
+    h->uploadLimit   = -1;
+    h->downloadLimit = -1;
+    
     h->fdlimit  = tr_fdInit();
     h->choking  = tr_chokingInit( h );
@@ -193 +194 @@
 void tr_setGlobalUploadLimit( tr_handle_t * h, int limit )
 {
-    tr_rcSetLimit( h->upload, limit );
+    h->uploadLimit = limit;
     tr_chokingSetLimit( h->choking, limit );
 }
@@ -199 +200 @@
 void tr_setGlobalDownloadLimit( tr_handle_t * h, int limit )
 {
-    tr_rcSetLimit( h->download, limit );
+    h->downloadLimit = limit;
+}
+
+void tr_setUseCustomLimit( tr_torrent_t * tor, int limit )
+{
+    tor->customSpeedLimit = limit;
 }
 
@@ -273 +279 @@
     tr_info_t     * inf;
     int             i;
-
+    
     inf        = &tor->info;
     inf->flags = flags;
@@ -290 +296 @@
     }
 
+    tor->handle = h;
     tor->status = TR_STATUS_PAUSE;
     tor->id     = h->id;
@@ -310 +317 @@
     tr_lockInit( &tor->lock );
 
-    tor->globalUpload   = h->upload;
-    tor->globalDownload = h->download;
     tor->fdlimit        = h->fdlimit;
     tor->upload         = tr_rcInit();
@@ -739 +744 @@
     tr_chokingClose( h->choking );
     tr_fdClose( h->fdlimit );
-    tr_rcClose( h->upload );
-    tr_rcClose( h->download );
     free( h );
 

trunk/libtransmission/transmission.h

@@ -161 +161 @@
 void tr_torrentIterate( tr_handle_t *, tr_callback_t, void * );
 
+void tr_setUseCustomLimit( tr_torrent_t * tor, int limit );
+void tr_setUploadLimit( tr_torrent_t * tor, int limit );
+void tr_setDownloadLimit( tr_torrent_t * tor, int limit );
+
 /***********************************************************************
  * tr_torrentRates

trunk/macosx/Torrent.m

@@ -593 +593 @@
 - (void) updateSpeedSetting
 {
-    tr_setUploadLimit(fHandle, fLimitCustom && fCheckUpload ? fUploadLimit : -1);
-    tr_setDownloadLimit(fHandle, fLimitCustom && fCheckDownload ? fDownloadLimit : -1);
+    tr_setUseCustomLimit(fHandle, fLimitCustom);
+    tr_setUploadLimit(fHandle, fCheckUpload ? fUploadLimit : -1);
+    tr_setDownloadLimit(fHandle, fCheckDownload ? fDownloadLimit : -1);
 }