Changeset 7789

Timestamp:

Jan 24, 2009, 3:17:59 AM (12 years ago)

Author:

charles

Message:

(trunk libT) don't limit peer bandwidth during the handshake phase. this solves a bug that made it difficult to connect to peers when the upload bandwidth is saturated.

Location:

trunk/libtransmission

Files:

• bandwidth.c (modified) (2 diffs)
• peer-io.c (modified) (3 diffs)
• peer-io.h (modified) (2 diffs)

trunk/libtransmission/bandwidth.c

@@ -209 +209 @@
         tr_peerIoRef( peers[i] );
 
-    /* Stop all peers from listening for the socket to be ready for IO.
-     * See "Second phase of IO" lower in this function for more info. */
-    for( i=0; i<peerCount; ++i )
-        tr_peerIoSetEnabled( peers[i], dir, FALSE );
-
     /* First phase of IO.  Tries to distribute bandwidth fairly to keep faster
      * peers from starving the others.  Loop through the peers, giving each a
@@ -247 +242 @@
      * or (2) the next tr_bandwidthAllocate() call, when we start over again. */
     for( i=0; i<peerCount; ++i )
-        if( tr_peerIoHasBandwidthLeft( peers[i], dir ) )
-            tr_peerIoSetEnabled( peers[i], dir, TRUE );
+        tr_peerIoSetEnabled( peers[i], dir, tr_peerIoHasBandwidthLeft( peers[i], dir ) );
 
     for( i=0; i<peerCount; ++i )

trunk/libtransmission/peer-io.c

@@ -824 +824 @@
     }
 
-    dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %d", (int)dir, limit, bytesUsed );
+    dbgmsg( io, "flushing peer-io, hasFinishedConnecting %d, direction %d, limit %zu, bytesUsed %d", (int)io->hasFinishedConnecting, (int)dir, limit, bytesUsed );
     return bytesUsed;
 }
@@ -835 +835 @@
 event_enable( tr_peerIo * io, short event )
 {
-    if( event & EV_READ )
+    if( event & EV_READ ) {
+        dbgmsg( io, "enabling libevent ready-to-read polling" );
         event_add( &io->event_read, NULL );
-
-    if( event & EV_WRITE )
+    }
+
+    if( event & EV_WRITE ) {
+        dbgmsg( io, "enabling libevent ready-to-write polling" );
         event_add( &io->event_write, NULL );
+    }
 }
 
@@ -845 +849 @@
 event_disable( struct tr_peerIo * io, short event )
 {
-    if( event & EV_READ )
+    if( event & EV_READ ) {
+        dbgmsg( io, "disabling libevent ready-to-read polling" );
         event_del( &io->event_read );
-
-    if( event & EV_WRITE )
+    }
+
+    if( event & EV_WRITE ) {
+        dbgmsg( io, "disabling libevent ready-to-write polling" );
         event_del( &io->event_write );
+    }
 }
 

trunk/libtransmission/peer-io.h

@@ -328 +328 @@
 
 static TR_INLINE void tr_peerIoSetParent( tr_peerIo            * io,
-                                       struct tr_bandwidth  * parent )
+                                          struct tr_bandwidth  * parent )
 {
     assert( tr_isPeerIo( io ) );
@@ -341 +341 @@
 
 static TR_INLINE tr_bool tr_peerIoHasBandwidthLeft( const tr_peerIo  * io,
-                                                 tr_direction       dir )
-{
-    assert( tr_isPeerIo( io ) );
-
-    return tr_bandwidthClamp( &io->bandwidth, dir, 1024 ) > 0;
+                                                    tr_direction       dir )
+{
+    assert( tr_isPeerIo( io ) );
+
+    return !io->hasFinishedConnecting
+        || ( tr_bandwidthClamp( &io->bandwidth, dir, 1024 ) > 0 );
 }