Changeset 7432

Timestamp:

Dec 17, 2008, 1:29:03 PM (12 years ago)

Author:

charles

Message:

(trunk libT) tweak the new peer IO code a bit to handle EINPROGRESS

Location:

trunk/libtransmission

Files:

• bandwidth.c (modified) (2 diffs)
• peer-io.c (modified) (1 diff)

trunk/libtransmission/bandwidth.c

@@ -298 +298 @@
     tr_ptrArray * tmp;
     struct tr_peerIo ** peers;
-    const size_t chunkSize = 1024; /* arbitrary */
 
     tmp = tr_ptrArrayNew( );
@@ -313 +312 @@
         for( i=0; i<n; )
         {
-            const int byteCount = tr_peerIoFlush( peers[i], dir, chunkSize );
+            const int increment = n==1 ? 4096 : 1024;
+            const int byteCount = tr_peerIoFlush( peers[i], dir, increment);
 
             if( byteCount )
                 fprintf( stderr, "peer %p: %d bytes\n", peers[i], byteCount );
 
-            if( byteCount == (int)chunkSize )
+            if( byteCount == increment )
                 ++i;
             else

trunk/libtransmission/peer-io.c

@@ -808 +808 @@
         canReadWrapper( io, res, io );
 
-    if( ( res <= 0 ) && ( io->gotError ) && ( errno != EAGAIN ) && ( errno != EINTR ) )
+    if( ( res <= 0 ) && ( io->gotError ) && ( errno != EAGAIN ) && ( errno != EINTR ) && ( errno != EINPROGRESS ) )
     {
         short what = EVBUFFER_READ | EVBUFFER_ERROR;