Changeset 3139

Timestamp:

Sep 22, 2007, 2:32:02 PM (16 years ago)

Author:

charles

Message:

tweak the peer mgr

File:

• trunk/libtransmission/peer-mgr.c (modified) (6 diffs)

trunk/libtransmission/peer-mgr.c

@@ -639 +639 @@
             const int peerIsSeed = e->progress >= 1.0;
             if( clientIsSeed && peerIsSeed ) {
-                fprintf( stderr, "DISCONNECTING FROM PEER because both of us are seeds\n" );
+                fprintf( stderr, "DISCONNECTING FROM PEER %s because both of us are seeds\n", tr_peerIoGetAddrStr(peer->io) );
                 peer->doDisconnect = 1;
             }
@@ -650 +650 @@
 
         case TR_PEERMSG_GOT_ERROR:
+            fprintf( stderr, "DISCONNECTING FROM PEER %s because we got an error\n", tr_peerIoGetAddrStr(peer->io));
             peer->doDisconnect = 1;
             reconnectSoon( t );
@@ -1209 +1210 @@
     const int isSeeding = tr_cpGetStatus( t->tor->completion ) != TR_CP_INCOMPLETE;
 
-fprintf( stderr, "[%s] doing upkeep on our peer connections\n", t->tor->info.name );
-
     /* how many connections do we have? */
     for( i=liveCount=0; i<size; ++i )
@@ -1220 +1219 @@
         tr_peer * peer = peers[i];
         if( shouldPeerBeDisconnected( t, peer, liveCount, isSeeding ) ) {
-            fprintf( stderr, "%s is a bum.  I'm hanging up on them.\n", tr_peerIoGetAddrStr(peer->io) );
+            fprintf( stderr, "[%s] %s is a bum.  I'm hanging up on them.\n", t->tor->info.name, tr_peerIoGetAddrStr(peer->io) );
             disconnectPeer( peer );
             --liveCount;
@@ -1247 +1246 @@
         qsort( pool, poolSize, sizeof(tr_peer*), comparePeerByConnectionDate );
 
-        /* debugging */
-        if( poolSize > 0 ) {
-            fprintf( stderr, "here are some peers that I might want to connect to: \n" );
-            for( i=0; i<poolSize; ++i )
-                fprintf( stderr, "%"PRIu64", ", (uint64_t)pool[i]->connectionChangedAt );
-            fprintf( stderr, "\n" );
-        }
-
         /* make some connections */
         for( i=0; i<poolSize && left>0; ++i )
@@ -1261 +1252 @@
             tr_peerIo * io;
 
-            if( ( now - peer->connectionChangedAt ) < MIN_HANGUP_PERIOD_SEC ) {
-                fprintf( stderr, "out of candidates\n" );
+            if( ( now - peer->connectionChangedAt ) < MIN_HANGUP_PERIOD_SEC )
                 break;
-            }
 
             /* already have a handshake pending */
-            if( getExistingHandshake( manager, &peer->in_addr ) != NULL ) {
-                fprintf( stderr, "already have a handshake for that address\n" );
+            if( getExistingHandshake( manager, &peer->in_addr ) != NULL )
                 continue;
-            }
 
             /* initiate a connection to the peer */
             io = tr_peerIoNewOutgoing( manager->handle, &peer->in_addr, peer->port, t->hash );
-            fprintf( stderr, "we haven't tried %s in awhile...\n", tr_peerIoGetAddrStr(io) );
+            fprintf( stderr, "[%s] connecting to potential peer %s\n", t->tor->info.name, tr_peerIoGetAddrStr(io) );
             peer->connectionChangedAt = time( NULL );
             initiateHandshake( manager, io );