Changeset 1137

Timestamp:

Nov 26, 2006, 4:05:45 AM (16 years ago)

Author:

livings124

Message:

use min interval when stressing the tracker for peers (don't get excited people, min interval is forced between 10 secs and 5 min just like the regular interval ;))

File:

• branches/scrape/libtransmission/tracker.c (modified) (4 diffs)

branches/scrape/libtransmission/tracker.c

@@ -36 +36 @@
 
     int            interval;
+    int            minInterval;
     int            scrapeInterval;
     int            seeders;
@@ -75 +76 @@
 
     tc->interval = 300;
+    tc->minInterval = 0;
     tc->scrapeInterval = 600;
     tc->seeders  = -1;
@@ -127 +129 @@
     if( tc->hasManyPeers && !tc->tor->finished )
     {
-        if( tc->tor->peerCount < 5 && now > tc->dateOk + 10000 )
-        {
-            return 1;
-        }
-        if( tc->tor->peerCount < 10 && now > tc->dateOk + 20000 )
-        {
-            return 1;
-        }
-        if( tc->tor->peerCount < 15 && now > tc->dateOk + 30000 )
-        {
-            return 1;
+        if ( tc->min_interval )
+        {
+            if( tc->tor->peerCount < 20 && now > tc->dateOk + 1000 * tc->minInterval )
+            {
+                return 1;
+            }
+        }
+        else if( tc->tor->peerCount < 5 )
+        {
+            if( now > tc->dateOk + 1000 * 30 )
+            {
+                return 1;
+            }
+        }
+        else if( tc->tor->peerCount < 10 )
+        {
+            if( now > tc->dateOk + 1000 * 60 )
+            {
+                return 1;
+            }
+        }
+        else if( tc->tor->peerCount < 20 )
+        {
+            if( now > tc->dateOk + 1000 * 90 )
+            {
+                return 1;
+            }
         }
     }
@@ -462 +480 @@
     tc->lastAttempt = TC_ATTEMPT_OK;
 
-    if( !tc->interval )
-    {
-        /* Get the tracker interval, ignore it if it is not between
-           10 sec and 5 mins */
-        if( !( beFoo = tr_bencDictFind( &beAll, "interval" ) ) ||
-            !( beFoo->type & TYPE_INT ) )
-        {
-            tr_err( "Tracker: no 'interval' field" );
-            goto cleanup;
-        }
-
-        tc->interval = beFoo->val.i;
-        tc->interval = MIN( tc->interval, 300 );
-        tc->interval = MAX( 10, tc->interval );
-
-        tr_inf( "Tracker: interval = %d seconds", tc->interval );
+    /* Get the tracker interval, force to between
+       10 sec and 5 mins */
+    if( !( beFoo = tr_bencDictFind( &beAll, "interval" ) ) ||
+        !( beFoo->type & TYPE_INT ) )
+    {
+        tr_err( "Tracker: no 'interval' field" );
+        goto cleanup;
+    }
+
+    tc->interval = beFoo->val.i;
+    tr_inf( "Tracker: interval = %d seconds", tc->interval );
+    
+    tc->interval = MIN( tc->interval, 300 );
+    tc->interval = MAX( 10, tc->interval );
+    
+    /* Get the tracker minimum interval, force to between
+       10 sec and 5 mins  */
+    if( ( beFoo = tr_bencDictFind( &beAll, "min interval" ) ) &&
+        ( beFoo->type & TYPE_INT ) )
+    {
+        tc->minInterval = beFoo->val.i;
+        tr_inf( "Tracker: min interval = %d seconds", tc->minInterval );
+        
+        tc->minInterval = MIN( tc->minInterval, 300 );
+        tc->minInterval = MAX( 10, tc->minInterval );
+        
+        if( tc->interval < tc->minInterval)
+        {
+            tc->interval = tc->minInterval;
+            tr_inf( "Tracker: 'interval' less than 'min interval', use 'min interval'" );
+        }
+    }
+    else
+    {
+        tc->minInterval = 0;
+        tr_inf( "Tracker: no 'min interval' field" );
     }