Changeset 7977 for trunk/libtransmission/torrent.c

Timestamp:

Mar 1, 2009, 1:56:22 PM (14 years ago)

Author:

charles

Message:

(trunk libT) #1823: Ratio limit is only checked when peers are active

File:

• trunk/libtransmission/torrent.c (modified) (15 diffs)

trunk/libtransmission/torrent.c

@@ -59 +59 @@
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( session, tor ) ) )
+    while(( tor = tr_torrentNext( session, tor )))
         if( tor->uniqueId == id )
             return tor;
@@ -71 +71 @@
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( session, tor ) ) )
+    while(( tor = tr_torrentNext( session, tor )))
         if( !strcmp( str, tor->info.hashString ) )
             return tor;
@@ -83 +83 @@
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( session, tor ) ) )
+    while(( tor = tr_torrentNext( session, tor )))
         if( *tor->info.hash == *torrentHash )
             if( !memcmp( tor->info.hash, torrentHash, SHA_DIGEST_LENGTH ) )
@@ -97 +97 @@
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( session, tor ) ) )
+    while(( tor = tr_torrentNext( session, tor )))
         if( !memcmp( tor->obfuscatedHash, obfuscatedTorrentHash,
                      SHA_DIGEST_LENGTH ) )
@@ -152 +152 @@
 
 void
-tr_torrentSetRatioMode( tr_torrent *  tor,                    
-                        tr_ratiolimit mode )
+tr_torrentSetRatioMode( tr_torrent *  tor, tr_ratiolimit mode )
 {
     assert( tr_isTorrent( tor ) );
@@ -159 +158 @@
 
     tor->ratioLimitMode = mode;
+
+    tr_torrentCheckSeedRatio( tor );
 }
 
@@ -175 +176 @@
     assert( tr_isTorrent( tor ) );
 
-    tor->desiredRatio = desiredRatio;   
+    tor->desiredRatio = desiredRatio;
+
+    tr_torrentCheckSeedRatio( tor );
 }
 
@@ -904 +907 @@
                 s->eta = s->leftUntilDone / s->pieceDownloadSpeed / 1024.0;
             break;
-        
+
         case TR_STATUS_SEED:
             if( tr_torrentGetSeedRatio( tor, &seedRatio ) )
@@ -916 +919 @@
                 s->eta = TR_ETA_NOT_AVAIL;
             break;
-        
+
         default:
             s->eta = TR_ETA_NOT_AVAIL;
@@ -1545 +1548 @@
 
 static void
-setFileDND( tr_torrent *    tor,
-            tr_file_index_t fileIndex,
-            int             doDownload )
+setFileDND( tr_torrent * tor, tr_file_index_t fileIndex, int doDownload )
 {
     tr_file *        file;
@@ -1602 +1603 @@
 
 void
-tr_torrentInitFileDLs( tr_torrent *      tor,
+tr_torrentInitFileDLs( tr_torrent      * tor,
                        tr_file_index_t * files,
                        tr_file_index_t   fileCount,
@@ -1613 +1614 @@
     tr_torrentLock( tor );
 
-    for( i = 0; i < fileCount; ++i )
+    for( i=0; i<fileCount; ++i )
         setFileDND( tor, files[i], doDownload );
-    tr_cpInvalidateDND ( &tor->completion );
+    tr_cpInvalidateDND( &tor->completion );
+    tr_torrentCheckSeedRatio( tor );
 
     tr_torrentUnlock( tor );
@@ -1749 +1751 @@
 
     if( isChecked )
-        tr_bitfieldAddRange ( &tor->checkedPieces, begin, end );
+        tr_bitfieldAddRange( &tor->checkedPieces, begin, end );
     else
-        tr_bitfieldRemRange ( &tor->checkedPieces, begin, end );
+        tr_bitfieldRemRange( &tor->checkedPieces, begin, end );
 }
 
@@ -1778 +1780 @@
     assert( tr_isTorrent( tor ) );
 
-    tr_bitfieldRemRange ( &tor->checkedPieces, 0, tor->info.pieceCount );
+    tr_bitfieldRemRange( &tor->checkedPieces, 0, tor->info.pieceCount );
 }
 
@@ -2112 +2114 @@
     }
 }
+
+/***
+****
+***/
+
+void
+tr_torrentCheckSeedRatio( tr_torrent * tor )
+{
+    double seedRatio;
+
+    assert( tr_isTorrent( tor ) );
+
+    /* if we're seeding and we've reached our seed ratio limit, stop the torrent */
+    if( tr_torrentIsSeed( tor ) && tr_torrentGetSeedRatio( tor, &seedRatio ) )
+    {
+        const double up = tor->uploadedCur + tor->uploadedPrev;
+        const double down = tor->downloadedCur + tor->downloadedPrev;
+        const double ratio = tr_getRatio( up, down );
+        if( ratio >= seedRatio )
+        {
+            tr_torrentStop( tor );
+
+            /* set to no ratio limit to allow easy restarting */
+            tr_torrentSetRatioMode( tor, TR_RATIOLIMIT_UNLIMITED );
+
+            /* maybe notify the client */
+            if( tor->ratio_limit_hit_func != NULL )
+                tor->ratio_limit_hit_func( tor, tor->ratio_limit_hit_func_user_data );
+
+        }
+    }
+}