Changeset 7495 for trunk/libtransmission/bandwidth.c

Timestamp:

Dec 24, 2008, 5:45:27 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #1627: OSX mutex lockup in 141 and up to 7490

File:

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

trunk/libtransmission/bandwidth.c

@@ -8 +8 @@
  * the Transmission project.
  *
- * $Id:$
+ * $Id$
  */
 
@@ -297 +297 @@
     tr_ptrArray * tmp;
     struct tr_peerIo ** peers;
+    const uint64_t now = tr_date( );
+    const uint64_t cutoff = now + 100; /* 1/10th of a second */
+
 
     /* allocateBandwidth() is a helper function with two purposes:
@@ -312 +315 @@
     /* 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 run out of bandwidth
-     * or pweers that can use it */
+     * small chunk of bandwidth.  Keep looping until we reach the cutoff or
+     * 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; )
+    for( ; n>0 && tr_date()<=cutoff; )
     {
         const int increment = n==1 ? 4096 : 1024;