Changeset 3844

Timestamp:

Nov 17, 2007, 12:16:26 AM (15 years ago)

Author:

charles

Message:

speed limit code cleanup

Location:

trunk/libtransmission

Files:

• peer-io.c (modified) (1 diff)
• ratecontrol.c (modified) (4 diffs)
• ratecontrol.h (modified) (1 diff)

trunk/libtransmission/peer-io.c

@@ -30 +30 @@
 #define IO_TIMEOUT_SECS 8
 
-/* arbitrary. */
-#define TR_RDBUF (1024*6)
+#define TR_RDBUF 2048
 
 /**

trunk/libtransmission/ratecontrol.c

@@ -30 +30 @@
 #include "utils.h"
 
-#define GRANULARITY_MSEC 250
+#define GRANULARITY_MSEC 200
 #define SHORT_INTERVAL_MSEC 2000
-#define LONG_INTERVAL_MSEC 10000
+#define LONG_INTERVAL_MSEC 8000
 #define HISTORY_SIZE (LONG_INTERVAL_MSEC / GRANULARITY_MSEC)
 
@@ -95 +95 @@
 ***/
 
-int
-tr_rcCanTransfer( const tr_ratecontrol * r )
-{
-    int ret;
-
-    if( r == NULL )
-        ret = 0;
-    else {
-        tr_lockLock( (tr_lock*)r->lock );
-        ret = rateForInterval( r, SHORT_INTERVAL_MSEC ) < r->limit;
-        tr_lockUnlock( (tr_lock*)r->lock );
-    }
-
-    return ret;
-}
-
 size_t
 tr_rcBytesLeft( const tr_ratecontrol * r )
@@ -118 +102 @@
     if( r != NULL )
     {
-        float cur, max;
-        size_t kb;
+        float cur, max, kb;
  
         tr_lockLock( (tr_lock*)r->lock );
@@ -126 +109 @@
         max = r->limit;
         kb = max>cur ? max-cur : 0;
-        bytes = kb * 1024u;
+        bytes = (size_t)(kb * 1024u);
 
         tr_lockUnlock( (tr_lock*)r->lock );

trunk/libtransmission/ratecontrol.h

@@ -31 +31 @@
 void             tr_rcSetLimit( tr_ratecontrol *, int );
 int              tr_rcGetLimit( const tr_ratecontrol * );
-int              tr_rcCanTransfer( const tr_ratecontrol * );
 size_t           tr_rcBytesLeft( const tr_ratecontrol * );
 void             tr_rcTransferred( tr_ratecontrol *, size_t byteCount );