Changeset 3337

Timestamp:

Oct 9, 2007, 4:50:10 AM (15 years ago)

Author:

charles

Message:

fix recent tracker error reported by John_Clay that made it slower to pick up peers

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (1 diff)
• tracker.c (modified) (4 diffs)

trunk/libtransmission/peer-mgr.c

@@ -1612 +1612 @@
         const int peerCount = tr_ptrArraySize( t->peers );
 
-        tordbg( t, "RECONNECT pulse for [%s]: %d weak connections, %d connection candidates, %d atoms, max per pulse is %d",
-                 t->tor->info.name, nWeak, nCandidates, tr_ptrArraySize(t->pool), (int)MAX_RECONNECTIONS_PER_PULSE );
+        if( nWeak || nCandidates )
+            tordbg( t, "reconnect pulse for [%s]: %d weak connections, "
+                       "%d connection candidates, %d atoms, max per pulse is %d",
+                       t->tor->info.name, nWeak, nCandidates,
+                       tr_ptrArraySize(t->pool),
+                       (int)MAX_RECONNECTIONS_PER_PULSE );
 
         /* disconnect some peers */

trunk/libtransmission/tracker.c

@@ -49 +49 @@
 #define STOPPING_TIMEOUT_INTERVAL_SEC 8
 
-/* the value of the 'numwant' argument passed in tracker requests */
-#define NUMWANT 128
+/* the value of the 'numwant' argument passed in tracker requests.
+ * this should be big, but if it's *too* big trackers will ignore it */
+#define NUMWANT 50
 
 /* the length of the 'key' argument passed in tracker requests */
@@ -745 +746 @@
                         const char        * eventName )
 {
-    const int stopping = !strcmp( eventName, "stopped" );
-    const int numwant = stopping ? 0 : NUMWANT;
+    const int isStopping = !strcmp( eventName, "stopped" );
+    const int numwant = isStopping ? 0 : NUMWANT;
     char buf[4096];
 
@@ -976 +977 @@
 {
     Torrent * t = (Torrent *) vt;
+    const int isStopping = eventName && !strcmp( eventName, "stopped" );
     const tr_tracker_info * address = getCurrentAddress( t->tracker );
     char * uri;
@@ -1004 +1006 @@
         tr_free( t->lastRequest );
         t->lastRequest = tr_strdup( eventName );
-        if( !eventName || !strcmp( eventName, "stopped" ) ) {
+        if( isStopping ) {
+            evhttp_connection_set_timeout( evcon, STOPPING_TIMEOUT_INTERVAL_SEC );
+            httpReq = evhttp_request_new( onStoppedResponse, t->tracker->handle );
+        } else {
             evhttp_connection_set_timeout( evcon, TIMEOUT_INTERVAL_SEC );
             httpReq = evhttp_request_new( onTrackerResponse, onTrackerResponseDataNew(t) );
-        } else {
-            evhttp_connection_set_timeout( evcon, STOPPING_TIMEOUT_INTERVAL_SEC );
-            httpReq = evhttp_request_new( onStoppedResponse, t->tracker->handle );
         }
         addCommonHeaders( t->tracker, httpReq );