Changeset 1869

Timestamp:

May 16, 2007, 2:03:18 AM (15 years ago)

Author:

livings124

Message:

determine upload/download rates the old way, which is not the most accurate way at a few points, but should have a positive overall impact

Location:

trunk/libtransmission

Files:

• internal.h (modified) (1 diff)
• peer.c (modified) (4 diffs)
• ratecontrol.c (modified) (1 diff)
• ratecontrol.h (modified) (1 diff)
• torrent.c (modified) (1 diff)
• transmission.c (modified) (4 diffs)

trunk/libtransmission/internal.h

@@ -220 +220 @@
 struct tr_handle_s
 {
-    int            torrentCount;
-    tr_torrent_t * torrentList;
-
-    char         * tag;
-    int            isPortSet;
-    int            uploadLimit;
-    int            downloadLimit;
-    tr_shared_t  * shared;
+    int                torrentCount;
+    tr_torrent_t     * torrentList;
+
+    char             * tag;
+    int                isPortSet;
+
+    tr_ratecontrol_t * upload;
+    tr_ratecontrol_t * download;
+
+    tr_shared_t      * shared;
 
 #define TR_ID_LEN               20

trunk/libtransmission/peer.c

@@ -281 +281 @@
         if( tor )
         {
-            if( tor->customDownloadLimit )
+            if( tor->customDownloadLimit
+                ? !tr_rcCanTransfer( tor->download )
+                : !tr_rcCanTransfer( tor->handle->download ) )
             {
-                if( !tr_rcCanTransfer( tor->download ) )
-                {
-                    break;
-                }
-            }
-            else
-            {
-                tr_lockUnlock( &tor->lock );
-                if( !tr_rcCanGlobalTransfer( tor->handle, 0 ) )
-                {
-                    tr_lockLock( &tor->lock );
-                    break;
-                }
-                tr_lockLock( &tor->lock );
+                break;
             }
         }
@@ -329 +318 @@
             tr_rcTransferred( peer->download, ret );
             tr_rcTransferred( tor->download, ret );
+            if ( !tor->customDownloadLimit )
+            {
+                tr_rcTransferred( tor->handle->download, ret );
+            }
+            
             if( ( ret = parseBuf( tor, peer ) ) )
             {
@@ -490 +484 @@
     while( ( p = blockPending( tor, peer, &size ) ) )
     {
-        if( tor->customUploadLimit )
-        {
-            if( !tr_rcCanTransfer( tor->upload ) )
-            {
-                break;
-            }
-        }
-        else
-        {
-            tr_lockUnlock( &tor->lock );
-            if( !tr_rcCanGlobalTransfer( tor->handle, 1 ) )
-            {
-                tr_lockLock( &tor->lock );
-                break;
-            }
-            tr_lockLock( &tor->lock );
+        if( tor->customUploadLimit
+            ? !tr_rcCanTransfer( tor->upload )
+            : !tr_rcCanTransfer( tor->handle->upload ) )
+        {
+            break;
         }
 
@@ -521 +504 @@
         tr_rcTransferred( peer->upload, ret );
         tr_rcTransferred( tor->upload, ret );
+        if ( !tor->customUploadLimit )
+        {
+            tr_rcTransferred( tor->handle->upload, ret );
+        }
 
         tor->uploadedCur += ret;

trunk/libtransmission/ratecontrol.c

@@ -81 +81 @@
 
     return r;
-}
-
-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 limit < 0;
-    }
-    
-    tr_sharedLock( h->shared );
-    for( tor = h->torrentList; tor; tor = tor->next )
-    {
-        if( isUpload ? tor->customUploadLimit : tor->customDownloadLimit )
-        {
-            continue;
-        }
-        
-        r = isUpload ? tor->upload : tor->download;
-        tr_lockLock( &r->lock );
-        rate += rateForInterval( r, SHORT_INTERVAL );
-        tr_lockUnlock( &r->lock );
-        
-        if( rate >= (float)limit )
-        {
-            tr_sharedUnlock( h->shared );
-            return 0;
-        }
-    }
-    tr_sharedUnlock( h->shared );
-    
-    return 1;
 }
 

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/torrent.c

@@ -241 +241 @@
 int tr_torrentDuplicateDownload( tr_torrent_t * tor )
 {
-    tr_torrent_t * current, * next;
+    tr_torrent_t * current;
     
     /* Check if a torrent with the same name and destination is already active */

trunk/libtransmission/transmission.c

@@ -80 +80 @@
 
     /* Initialize rate and file descripts controls */
-    h->uploadLimit   = -1;
-    h->downloadLimit = -1;
-    
+    h->upload   = tr_rcInit();
+    h->download = tr_rcInit();
+
     tr_fdInit();
     h->shared = tr_sharedInit( h );
@@ -126 +126 @@
 void tr_setGlobalUploadLimit( tr_handle_t * h, int limit )
 {
-    h->uploadLimit = limit;
+    tr_rcSetLimit( h->upload, limit );
     tr_sharedSetLimit( h->shared, limit );
 }
@@ -132 +132 @@
 void tr_setGlobalDownloadLimit( tr_handle_t * h, int limit )
 {
-    h->downloadLimit = limit;
+    tr_rcSetLimit( h->download, limit );
 }
 
@@ -171 +171 @@
 void tr_close( tr_handle_t * h )
 {
+    tr_rcClose( h->upload );
+    tr_rcClose( h->download );
+    
     tr_sharedClose( h->shared );
     tr_fdClose();