Changeset 7375

Timestamp:

Dec 14, 2008, 2:44:00 AM (12 years ago)

Author:

charles

Message:

(1.4x libT) copy the bandwidth randomization code back from trunk

Location:

branches/1.4x/libtransmission

Files:

• bandwidth.c (modified) (5 diffs)
• platform.c (modified) (2 diffs)

branches/1.4x/libtransmission/bandwidth.c

@@ -18 +18 @@
 #include "transmission.h"
 #include "bandwidth.h"
+#include "crypto.h"
 #include "iobuf.h"
 #include "ptrarray.h"
@@ -245 +246 @@
 #endif
 
-void
-tr_bandwidthAllocate( tr_bandwidth  * b,
-                      tr_direction    dir,
-                      int             period_msec )
+static void
+allocateBandwidth( tr_bandwidth  * b,
+                   tr_direction    dir,
+                   int             period_msec,
+                   tr_ptrArray   * addme_buffers )
 {
     assert( isBandwidth( b ) );
@@ -256 +258 @@
     {
         const double desiredSpeed = b->band[dir].desiredSpeed;
-#if 0
-        const double currentSpeed = getSpeed( &b->band[dir].piece, HISTORY_MSEC - period_msec );
-        const double pulseCount = ( HISTORY_MSEC - period_msec ) / (double)period_msec;
-        const double nextPulseSpeed = desiredSpeed * ( pulseCount + 1 ) - ( currentSpeed * pulseCount );
-#else
         const double nextPulseSpeed = desiredSpeed;
-#endif
         b->band[dir].bytesLeft = MAX( 0.0, nextPulseSpeed * 1024.0 * period_msec / 1000.0 );
 
@@ -275 +271 @@
     /* notify the io buffers that there's more bandwidth available */
     {
-        int i, n=0;
-        short what = dir==TR_UP ? EV_WRITE : EV_READ;
-        struct tr_iobuf ** iobufs = (struct tr_iobuf**) tr_ptrArrayPeek( b->iobufs, &n );
+        int i;
+        const int n = tr_ptrArraySize( b->iobufs );
+        for( i=0; i<n; ++i )
+            tr_ptrArrayAppend( addme_buffers, tr_ptrArrayNth( b->iobufs, i ) );
+    }
+
 #ifdef DEBUG_DIRECTION
 if( ( dir == DEBUG_DIRECTION ) && ( n > 1 ) )
 fprintf( stderr, "bandwidth %p has %d iobufs\n", b, n );
 #endif
-        for( i=0; i<n; ++i )
-            tr_iobuf_enable( iobufs[i], what );
-    }
 
     /* all children should reallocate too */
@@ -295 +291 @@
 }
 
+void
+tr_bandwidthAllocate( tr_bandwidth  * b,
+                      tr_direction    dir,
+                      int             period_msec )
+{
+    int n;
+    tr_ptrArray * tmp;
+    struct tr_iobuf ** buffers;
+    const short what = dir==TR_UP ? EV_WRITE : EV_READ;
+
+    tmp = tr_ptrArrayNew( );
+    allocateBandwidth( b, dir, period_msec, tmp );
+    buffers = (struct tr_iobuf**) tr_ptrArrayPeek( tmp, &n );
+
+    /* notify the io buffers in a random order s.t. no
+       particular peer gets to hog all the bandwidth */
+    while( n > 0 ) {
+        const int i = tr_cryptoRandInt( n );
+        tr_iobuf_enable( buffers[i], what );
+        buffers[i] = buffers[n-1];
+        --n;
+    }
+
+    tr_ptrArrayFree( tmp, NULL );
+}
+
 /***
 ****

branches/1.4x/libtransmission/platform.c

@@ -11 +11 @@
  */
 
+#include <event.h>
+
 #ifdef __BEOS__
  #include <signal.h>
@@ -103 +105 @@
     return tr_areThreadsEqual( tr_getCurrentThread( ), t->thread );
 }
-
-#include <event.h>
 
 #ifdef WIN32