Changeset 7487 for branches/1.4x

Timestamp:

Dec 24, 2008, 2:50:09 AM (14 years ago)

Author:

charles

Message:

(1.4x libT) fix connectivity error reported by Stargazer. Also, add more debug statements to track down errors like this in the future

Location:

branches/1.4x/libtransmission

Files:

• peer-io.c (modified) (12 diffs)
• peer-mgr.c (modified) (3 diffs)

branches/1.4x/libtransmission/peer-io.c

@@ -209 +209 @@
 {
     int res;
+    int e;
     tr_peerIo * io = vio;
-    const size_t howmuch = tr_bandwidthClamp( io->bandwidth, TR_DOWN, io->session->so_rcvbuf );
+
+    /* Limit the input buffer to 256K, so it doesn't grow too large */
+    size_t howmuch;
     const tr_direction dir = TR_DOWN;
+    const size_t max = 256 * 1024;
+    const size_t curlen = EVBUFFER_LENGTH( io->inbuf );
+
+    howmuch = curlen >= max ? 0 : max - curlen;
+    howmuch = tr_bandwidthClamp( io->bandwidth, TR_DOWN, howmuch );
 
     assert( tr_isPeerIo( io ) );
@@ -223 +231 @@
     }
 
+    errno = 0;
     res = evbuffer_read( io->inbuf, fd, howmuch );
+    e = errno;
 
     if( res > 0 )
@@ -239 +249 @@
             what |= EVBUFFER_EOF;
         else if( res == -1 ) {
-            if( errno == EAGAIN || errno == EINTR ) {
+            if( e == EAGAIN || e == EINTR ) {
                 tr_peerIoSetEnabled( io, dir, TRUE );
                 return;
@@ -246 +256 @@
         }
 
+        dbgmsg( io, "event_read_cb got an error. res is %d, what is %hd, errno is %d (%s)", res, what, e, strerror( e ) );
+
         if( io->gotError != NULL )
             io->gotError( io, what, io->userData );
@@ -256 +268 @@
     struct evbuffer * buffer = io->outbuf;
     int n = MIN( EVBUFFER_LENGTH( buffer ), howmuch );
-
+    int e;
+
+    errno = 0;
 #ifdef WIN32
     n = send(fd, buffer->buffer, n,  0 );
@@ -262 +276 @@
     n = write(fd, buffer->buffer, n );
 #endif
-    dbgmsg( io, "wrote %d to peer (%s)", n, (n==-1?strerror(errno):"") );
+    e = errno;
+    dbgmsg( io, "wrote %d to peer (%s)", n, (n==-1?strerror(e):"") );
 
     if( n == -1 )
@@ -277 +292 @@
 {
     int res = 0;
+    int e;
     short what = EVBUFFER_WRITE;
     tr_peerIo * io = vio;
@@ -286 +302 @@
     dbgmsg( io, "libevent says this peer is ready to write" );
 
-    howmuch = MIN( (size_t)io->session->so_sndbuf, EVBUFFER_LENGTH( io->outbuf ) );
-    howmuch = tr_bandwidthClamp( io->bandwidth, dir, howmuch );
+    /* Write as much as possible, since the socket is non-blocking, write() will
+     * return if it can't write any more data without blocking */
+    howmuch = tr_bandwidthClamp( io->bandwidth, dir, EVBUFFER_LENGTH( io->outbuf ) );
 
     /* if we don't have any bandwidth left, stop writing */
@@ -295 +312 @@
     }
 
+    errno = 0;
     res = tr_evbuffer_write( io, fd, howmuch );
+    e = errno;
+
     if (res == -1) {
 #ifndef WIN32
 /*todo. evbuffer uses WriteFile when WIN32 is set. WIN32 system calls do not
  *  *set errno. thus this error checking is not portable*/
-        if (errno == EAGAIN || errno == EINTR || errno == EINPROGRESS)
+        if (e == EAGAIN || e == EINTR || e == EINPROGRESS)
             goto reschedule;
         /* error case */
@@ -328 +348 @@
 
  error:
+
+    dbgmsg( io, "event_write_cb got an error. res is %d, what is %hd, errno is %d (%s)", res, what, e, strerror( e ) );
+
     if( io->gotError != NULL )
         io->gotError( io, what, io->userData );
@@ -860 +883 @@
 tr_peerIoTryRead( tr_peerIo * io, size_t howmuch )
 {
-    int res;
-
-    assert( tr_isPeerIo( io ) );
-
-    howmuch = tr_bandwidthClamp( io->bandwidth, TR_DOWN, howmuch );
-
-    res = howmuch ? evbuffer_read( io->inbuf, io->socket, howmuch ) : 0;
-
-    dbgmsg( io, "read %d from peer (%s)", res, (res==-1?strerror(errno):"") );
-
-    if( EVBUFFER_LENGTH( io->inbuf ) )
-        canReadWrapper( io );
-
-    if( ( res <= 0 ) && ( io->gotError ) && ( errno != EAGAIN ) && ( errno != EINTR ) && ( errno != EINPROGRESS ) )
+    int res = 0;
+
+    assert( tr_isPeerIo( io ) );
+
+    if(( howmuch = tr_bandwidthClamp( io->bandwidth, TR_DOWN, howmuch )))
     {
-        short what = EVBUFFER_READ | EVBUFFER_ERROR;
-        if( res == 0 )
-            what |= EVBUFFER_EOF;
-        io->gotError( io, what, io->userData );
+        int e;
+        errno = 0;
+        res = evbuffer_read( io->inbuf, io->socket, howmuch );
+        e = errno;
+
+        dbgmsg( io, "read %d from peer (%s)", res, (res==-1?strerror(e):"") );
+
+        if( EVBUFFER_LENGTH( io->inbuf ) )
+            canReadWrapper( io );
+
+        if( ( res <= 0 ) && ( io->gotError ) && ( e != EAGAIN ) && ( e != EINTR ) && ( e != EINPROGRESS ) )
+        {
+            short what = EVBUFFER_READ | EVBUFFER_ERROR;
+            if( res == 0 )
+                what |= EVBUFFER_EOF;
+            dbgmsg( io, "tr_peerIoTryRead got an error. res is %d, what is %hd, errno is %d (%s)", res, what, e, strerror( e ) );
+            io->gotError( io, what, io->userData );
+        }
     }
 
@@ -891 +919 @@
     assert( tr_isPeerIo( io ) );
 
-    howmuch = tr_bandwidthClamp( io->bandwidth, TR_UP, howmuch );
-
-    n = tr_evbuffer_write( io, io->socket, (int)howmuch );
-
-    if( n > 0 )
-        didWriteWrapper( io, n );
-
-    if( ( n < 0 ) && ( io->gotError ) && ( errno != EPIPE ) && ( errno != EAGAIN ) && ( errno != EINTR ) && ( errno != EINPROGRESS ) ) {
-        short what = EVBUFFER_WRITE | EVBUFFER_ERROR;
-        io->gotError( io, what, io->userData );
+    if(( howmuch = tr_bandwidthClamp( io->bandwidth, TR_UP, howmuch )))
+    {
+        int e;
+        errno = 0;
+        n = tr_evbuffer_write( io, io->socket, (int)howmuch );
+        e = errno;
+
+        if( n > 0 )
+            didWriteWrapper( io, n );
+
+        if( ( n < 0 ) && ( io->gotError ) && ( e != EPIPE ) && ( e != EAGAIN ) && ( e != EINTR ) && ( e != EINPROGRESS ) )
+        {
+            const short what = EVBUFFER_WRITE | EVBUFFER_ERROR;
+            dbgmsg( io, "tr_peerIoTryWrite got an error. res is %d, what is %hd, errno is %d (%s)", n, what, e, strerror( e ) );
+            io->gotError( io, what, io->userData );
+        }
     }
 

branches/1.4x/libtransmission/peer-mgr.c

@@ -913 +913 @@
         atom->myflags |= MYFLAG_BANNED;
         peer->doPurge = 1;
-        tordbg( t, "banning peer %s",
-               tr_peerIoAddrStr( &atom->addr, atom->port ) );
+        tordbg( t, "banning peer %s", tr_peerIoAddrStr( &atom->addr, atom->port ) );
     }
 }
@@ -1140 +1139 @@
                 addStrike( t, peer );
                 peer->doPurge = 1;
-                tordbg( t, "setting doPurge because we got an EINVAL error" );
+                tordbg( t, "setting %s doPurge flag because we got an EINVAL error", tr_peerIoAddrStr( &peer->addr, peer->port ) );
             }
             else if( ( e->err == ERANGE )
@@ -1148 +1147 @@
                 /* some protocol error from the peer */
                 peer->doPurge = 1;
-                tordbg( t, "setting doPurge because we got an ERANGE, EMSGSIZE, or ENOTCONN error" );
+                tordbg( t, "setting %s doPurge flag because we got an ERANGE, EMSGSIZE, or ENOTCONN error", tr_peerIoAddrStr( &peer->addr, peer->port ) );
             }
             else /* a local error, such as an IO error */