Changeset 3262

Timestamp:

Oct 1, 2007, 5:51:07 PM (15 years ago)

Author:

charles

Message:

throttle back how many concurrent connections we make.

File:

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

trunk/libtransmission/peer-mgr.c

@@ -63 +63 @@
     MAX_CONNECTED_PEERS_PER_TORRENT = 60,
 
+    MAX_RECONNECTIONS_PER_MINUTE = MAX_CONNECTED_PEERS_PER_TORRENT,
+    MAX_RECONNECTIONS_PER_PULSE = ((MAX_RECONNECTIONS_PER_MINUTE * RECONNECT_PERIOD_MSEC) / (60*1000)),
 
     ADDED_F_ENCRYPTION_FLAG = 1,
@@ -1634 +1636 @@
         const int peerCount = tr_ptrArraySize( t->peers );
 
-        fprintf( stderr, "RECONNECT pulse for [%s]: %d weak connections, %d connection candidates, %d atoms\n",
-                 t->tor->info.name, nConnections, nCandidates, tr_ptrArraySize(t->pool) );
+        fprintf( stderr, "RECONNECT pulse for [%s]: %d weak connections, %d connection candidates, %d atoms, max per pulse is %d\n",
+                 t->tor->info.name, nConnections, nCandidates, tr_ptrArraySize(t->pool), (int)MAX_RECONNECTIONS_PER_PULSE );
 
         for( i=0; i<nConnections; ++i )
@@ -1652 +1654 @@
         /* add some new ones */
         nAdd = MAX_CONNECTED_PEERS_PER_TORRENT - peerCount;
-        for( i=0; i<nAdd && i<nCandidates; ++i ) {
+        for( i=0; i<nAdd && i<nCandidates && i<MAX_RECONNECTIONS_PER_PULSE; ++i ) {
             struct peer_atom * atom = candidates[i];
             tr_peerIo * io = tr_peerIoNewOutgoing( t->manager->handle, &atom->addr, atom->port, t->hash );