Changeset 7560

Timestamp:

Dec 31, 2008, 9:15:22 PM (12 years ago)

Author:

charles

Message:

(trunk libT) take the timeout condition out of tr_bandwidthAllocate(). This may have the short-term effect of adding 1.41's `freeze' behavior into trunk for a bit. Yay!

File:

• trunk/libtransmission/bandwidth.c (modified) (2 diffs)

trunk/libtransmission/bandwidth.c

@@ -298 +298 @@
     tr_ptrArray tmp = TR_PTR_ARRAY_INIT;
     struct tr_peerIo ** peers;
-    const uint64_t now = tr_date( );
-    const uint64_t cutoff = now + 100; /* 1/10th of a second */
 
 
@@ -315 +313 @@
     /* First phase of IO.  Tries to distribute bandwidth fairly to keep faster
      * peers from starving the others.  Loop through the peers, giving each a
-     * small chunk of bandwidth.  Keep looping until we reach the cutoff or
-     * run out of bandwidth and/or peers that can use it */
+     * small chunk of bandwidth.  Keep looping until we run out of bandwidth
+     * and/or peers that can use it */
     n = peerCount;
     i = n ? tr_cryptoWeakRandInt( n ) : 0; /* pick a random starting point */
-    for( ; n>0 && tr_date()<=cutoff; )
-    {
-        const int increment = n==1 ? 4096 : 1024;
+    for( ; n>1 ; )
+    {
+        const int increment = 1024;
         const int byteCount = tr_peerIoFlush( peers[i], dir, increment);