Changeset 10477

Timestamp:

Apr 14, 2010, 12:03:23 AM (13 years ago)

Author:

charles

Message:

(trunk libT) #1869 "new status for torrents that reached the seed ratio" -- maybe fix the issue reported by leena

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (8 diffs)
• transmission.h (modified) (1 diff)

trunk/libtransmission/torrent.c

@@ -286 +286 @@
 }
 
+/* returns true if the seed ratio applies --
+ * it applies if the torrent's a seed AND it has a seed ratio set */
+static tr_bool
+tr_torrentGetSeedRatioBytes( tr_torrent * tor, uint64_t * setmeLeft, uint64_t * setmeGoal )
+{
+    double seedRatio;
+    tr_bool seedRatioApplies = FALSE;
+
+    if( tr_torrentGetSeedRatio( tor, &seedRatio ) )
+    {
+        const uint64_t upEver = tor->uploadedCur + tor->uploadedPrev;
+        const uint64_t goal = seedRatio * tr_cpSizeWhenDone ( &tor->completion );
+        if( setmeLeft ) *setmeLeft = goal > upEver ? goal - upEver : 0;
+        if( setmeGoal ) *setmeGoal = goal;
+        seedRatioApplies = tr_torrentIsSeed( tor );
+    }
+
+    return seedRatioApplies;
+}
+
+static tr_bool
+tr_torrentIsSeedRatioDone( tr_torrent * tor )
+{
+    uint64_t bytesLeft;
+    return tr_torrentGetSeedRatioBytes( tor, &bytesLeft, NULL ) && !bytesLeft;
+}
+
+void
+tr_torrentCheckSeedRatio( tr_torrent * tor )
+{
+    assert( tr_isTorrent( tor ) );
+
+    /* if we're seeding and we've reached our seed ratio limit, stop the torrent */
+    if( tor->isRunning && tr_torrentIsSeedRatioDone( tor ) )
+    {
+        tr_torrentStop( tor );
+
+        /* maybe notify the client */
+        if( tor->ratio_limit_hit_func != NULL )
+            tor->ratio_limit_hit_func( tor, tor->ratio_limit_hit_func_user_data );
+    }
+}
+
+
 /***
 ****
@@ -919 +963 @@
     int                     usableSeeds;
     uint64_t                now;
-    double                  downloadedForRatio, seedRatio=0;
     double                  d;
-    tr_bool                 checkSeedRatio;
+    uint64_t                seedRatioBytesLeft;
+    uint64_t                seedRatioBytesGoal;
+    tr_bool                 seedRatioApplies;
 
     if( !tor )
@@ -1001 +1046 @@
     }
 
-    downloadedForRatio = s->downloadedEver ? s->downloadedEver : s->haveValid;
-    s->ratio = tr_getRatio( s->uploadedEver, downloadedForRatio );
-
-    checkSeedRatio = tr_torrentGetSeedRatio( tor, &seedRatio );
+    s->ratio = tr_getRatio( s->uploadedEver,
+                            s->downloadedEver ? s->downloadedEver : s->haveValid );
+
+    seedRatioApplies = tr_torrentGetSeedRatioBytes( tor, &seedRatioBytesLeft,
+                                                         &seedRatioBytesGoal );
 
     switch( s->activity )
@@ -1029 +1075 @@
             break;
 
-        case TR_STATUS_SEED:
-            if( checkSeedRatio )
-            {
+        case TR_STATUS_SEED: {
+            if( !seedRatioApplies )
+                s->eta = TR_ETA_NOT_AVAIL;
+            else {
                 if( ( tor->etaULSpeedCalculatedAt + 800 ) < now ) {
                     tor->etaULSpeed = ( ( tor->etaULSpeedCalculatedAt + 4000 ) < now )
@@ -1038 +1085 @@
                     tor->etaULSpeedCalculatedAt = now;
                 }
-
                 if( s->pieceUploadSpeed < 0.1 )
                     s->eta = TR_ETA_UNKNOWN;
                 else
-                    s->eta = (downloadedForRatio * (seedRatio - s->ratio)) / tor->etaULSpeed / 1024.0;
+                    s->eta = seedRatioBytesLeft / tor->etaULSpeed / 1024.0;
             }
-            else
-                s->eta = TR_ETA_NOT_AVAIL;
             break;
+        }
 
         default:
@@ -1053 +1098 @@
     }
 
-    s->finished = !s->leftUntilDone && checkSeedRatio && (s->ratio >= seedRatio || s->ratio == TR_RATIO_INF);
-
-    if( !checkSeedRatio || s->ratio >= seedRatio || s->ratio == TR_RATIO_INF )
-        s->percentRatio = 1.0;
-    else if( s->ratio == TR_RATIO_NA )
-        s->percentRatio = 0.0;
+    s->finished = seedRatioApplies && !seedRatioBytesLeft;
+
+    if( !seedRatioApplies || s->finished )
+        s->seedRatioPercentDone = 1;
+    else if( !seedRatioBytesGoal ) /* impossible? safeguard for div by zero */
+        s->seedRatioPercentDone = 0;
     else
-        s->percentRatio = s->ratio / seedRatio;
+        s->seedRatioPercentDone = (double)(seedRatioBytesGoal - seedRatioBytesLeft) / seedRatioBytesGoal;
 
     tr_torrentUnlock( tor );
@@ -1379 +1424 @@
     {
         /* allow finished torrents to be resumed */
-        if( tor->stats.finished )
+        if( tr_torrentIsSeedRatioDone( tor ) )
             tr_torrentSetRatioMode( tor, TR_RATIOLIMIT_UNLIMITED );
 
@@ -2599 +2644 @@
 
 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( tor->isRunning && tr_torrentIsSeed( tor ) && tr_torrentGetSeedRatio( tor, &seedRatio ) )
-    {
-        const uint64_t up = tor->uploadedCur + tor->uploadedPrev;
-        uint64_t down = tor->downloadedCur + tor->downloadedPrev;
-        double ratio;
-
-        /* maybe we're the initial seeder and never downloaded anything... */
-        if( down == 0 )
-            down = tr_cpHaveValid( &tor->completion );
-
-        ratio = tr_getRatio( up, down );
-
-        if( ratio >= seedRatio || ratio == TR_RATIO_INF )
-        {
-            tr_torrentStop( tor );
-
-            /* maybe notify the client */
-            if( tor->ratio_limit_hit_func != NULL )
-                tor->ratio_limit_hit_func( tor, tor->ratio_limit_hit_func_user_data );
-        }
-    }
-}
-
-/***
-****
-***/
-
-void
 tr_torrentFileCompleted( tr_torrent * tor, tr_file_index_t fileNum )
 {

trunk/libtransmission/transmission.h

@@ -1719 +1719 @@
     float    percentDone;
 
-    /** The percentage of the actual ratio to the seed ratio.  This will be
-        equal to 1 if the ratio is reached or the torrent is set to seed forever.
+    /** How much has been uploaded to satisfy the seed ratio.
+        This is 1 if the ratio is reached or the torrent is set to seed forever.
         Range is [0..1] */
-    float    percentRatio;
+    float    seedRatioPercentDone;
 
     /** Speed all data being sent for this torrent. (KiB/s)