Changeset 3416

Timestamp:

Oct 15, 2007, 4:01:42 PM (15 years ago)

Author:

charles

Message:

fix choke fibrillation bug in new connections

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (8 diffs)
• peer-msgs.c (modified) (3 diffs)
• peer-msgs.h (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -140 +140 @@
         struct evbuffer * buf = evbuffer_new( );
         char timestr[64];
-        evbuffer_add_printf( buf, "[%s] %s: ",
-                             tr_getLogTimeStr( timestr, sizeof(timestr) ),
-                             t->tor->info.name );
+        evbuffer_add_printf( buf, "[%s] ", tr_getLogTimeStr( timestr, sizeof(timestr) ) );
+        if( t != NULL )
+            evbuffer_add_printf( buf, "%s ", t->tor->info.name );
         va_start( args, fmt );
         evbuffer_add_vprintf( buf, fmt, args );
@@ -956 +956 @@
     if( getExistingHandshake( manager->incomingHandshakes, addr ) == NULL )
     {
-        tr_peerIo * io = tr_peerIoNewIncoming( manager->handle, addr, port, socket );
-
-        tr_handshake * handshake = tr_handshakeNew( io,
-                                                    manager->handle->encryptionMode,
-                                                    myHandshakeDoneCB,
-                                                    manager );
+        tr_peerIo * io;
+        tr_handshake * handshake;
+
+        tordbg( NULL, "Got an INCOMING connection with %s", tr_peerIoAddrStr( addr, port ) );
+
+        io = tr_peerIoNewIncoming( manager->handle, addr, port, socket );
+
+        handshake = tr_handshakeNew( io,
+                                     manager->handle->encryptionMode,
+                                     myHandshakeDoneCB,
+                                     manager );
 
         tr_ptrArrayInsertSorted( manager->incomingHandshakes, handshake, handshakeCompare );
@@ -1430 +1435 @@
 {
     int i, peerCount, size=0, unchoked=0;
-    const time_t ignorePeersNewerThan = time(NULL) - MIN_CHOKE_PERIOD_SEC;
+    const time_t fibrillationTime = time(NULL) - MIN_CHOKE_PERIOD_SEC;
     tr_peer ** peers = getConnectedPeers( t, &peerCount );
     struct ChokeData * choke = tr_new0( struct ChokeData, peerCount );
@@ -1441 +1446 @@
         tr_peer * peer = peers[i];
         struct ChokeData * node;
-        if( peer->chokeChangedAt > ignorePeersNewerThan )
+        if( peer->chokeChangedAt > fibrillationTime )
             continue;
 
@@ -1566 +1571 @@
 getPeerCandidates( Torrent * t, int * setmeSize )
 {
-    int i, insize, outsize;
+    int i, atomCount, retCount;
     struct peer_atom ** atoms;
     struct peer_atom ** ret;
@@ -1574 +1579 @@
     assert( torrentIsLocked( t ) );
 
-    atoms = (struct peer_atom**) tr_ptrArrayPeek( t->pool, &insize );
-    ret = tr_new( struct peer_atom*, insize );
-    for( i=outsize=0; i<insize; ++i )
+    atoms = (struct peer_atom**) tr_ptrArrayPeek( t->pool, &atomCount );
+    ret = tr_new( struct peer_atom*, atomCount );
+    for( i=retCount=0; i<atomCount; ++i )
     {
         struct peer_atom * atom = atoms[i];
@@ -1609 +1614 @@
         }
 
-        ret[outsize++] = atom;
-    }
-
-    qsort( ret, outsize, sizeof(struct peer_atom*), compareAtomByTime );
-    *setmeSize = outsize;
+        ret[retCount++] = atom;
+    }
+
+    qsort( ret, retCount, sizeof(struct peer_atom*), compareAtomByTime );
+    *setmeSize = retCount;
     return ret;
 }
@@ -1654 +1659 @@
             struct peer_atom * atom = candidates[i];
 
-            tr_peerIo * io = tr_peerIoNewOutgoing( mgr->handle, &atom->addr, atom->port, t->hash );
+            tr_peerIo * io;
+
+            tordbg( t, "Starting an OUTGOING connection with %s",
+                       tr_peerIoAddrStr( &atom->addr, atom->port ) );
+
+            io = tr_peerIoNewOutgoing( mgr->handle, &atom->addr, atom->port, t->hash );
 
             tr_handshake * handshake = tr_handshakeNew( io,

trunk/libtransmission/peer-msgs.c

@@ -389 +389 @@
 }
 
-void
+#define MIN_CHOKE_PERIOD_SEC 10
+
+int
 tr_peerMsgsSetChoke( tr_peermsgs * msgs, int choke )
 {
+    int ret;
+    const time_t fibrillationTime = time(NULL) - MIN_CHOKE_PERIOD_SEC;
+
     assert( msgs != NULL );
     assert( msgs->info != NULL );
     assert( choke==0 || choke==1 );
 
-    if( msgs->info->peerIsChoked != choke )
+    if( msgs->info->chokeChangedAt > fibrillationTime )
+    {
+        dbgmsg( msgs, "Not changing choke to %d to avoid fibrillation", choke );
+        ret = FALSE;
+    }
+    else if( msgs->info->peerIsChoked != choke )
     {
         msgs->info->peerIsChoked = choke;
-        tr_list * walk;
         
         if( choke )
+        {
+            tr_list * walk;
             for( walk = msgs->peerAskedFor; walk != NULL; )
             {
@@ -414 +425 @@
                 walk = next;
             }
+        }
 
         protocolSendChoke( msgs, choke );
         msgs->info->chokeChangedAt = time( NULL );
-    }
+        ret = TRUE;
+    }
+
+    return ret;
 }
 
@@ -941 +956 @@
         case BT_BITFIELD: {
             const int clientIsSeed = tr_cpGetStatus( msgs->torrent->completion ) != TR_CP_INCOMPLETE;
+            dbgmsg( msgs, "got a bitfield" );
             assert( msglen == msgs->info->have->len );
             tr_peerIoReadBytes( msgs->io, inbuf, msgs->info->have->bits, msglen );

trunk/libtransmission/peer-msgs.h

@@ -30 +30 @@
 
 
-void         tr_peerMsgsSetChoke( tr_peermsgs *, int doChoke );
+int          tr_peerMsgsSetChoke( tr_peermsgs *, int doChoke );
 
 void         tr_peerMsgsHave( tr_peermsgs * msgs,