Changeset 11468

Timestamp:

Dec 5, 2010, 6:38:08 PM (12 years ago)

Author:

charles

Message:

(2.0x libtransmission) backport r11264 for #3453 "Torrent does not stop when set per torrent seed ratio is reached before torrent is completed"

Location:

branches/2.0x/libtransmission

Files:

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

branches/2.0x/libtransmission/peer-mgr.c

@@ -2380 +2380 @@
 **/
 
+void
+tr_peerMgrClearInterest( tr_torrent * tor )
+{
+    int i;
+    Torrent * t;
+    int peerCount;
+
+    assert( tr_isTorrent( tor ) );
+
+    t = tor->torrentPeers;
+
+    torrentLock( t );
+
+    peerCount = tr_ptrArraySize( &t->peers );
+
+    for( i=0; i<peerCount; ++i )
+    {
+        const tr_peer * peer = tr_ptrArrayNth( &t->peers, i );
+        tr_peerMsgsSetInterested( peer->msgs, FALSE );
+    }
+
+    torrentUnlock( t );
+}
+
 /* do we still want this piece and does the peer have it? */
 static tr_bool

branches/2.0x/libtransmission/peer-mgr.h

@@ -237 +237 @@
                              tr_direction       direction );
 
+void tr_peerMgrClearInterest( tr_torrent * tor );
+
 /* @} */
 

branches/2.0x/libtransmission/torrent.c

@@ -1476 +1476 @@
     /* if the torrent's running, stop it & set the restart-after-verify flag */
     if( tor->startAfterVerify || tor->isRunning ) {
+        /* don't clobber isStopping */
+        const tr_bool startAfter = tor->isStopping ? FALSE : TRUE;
         tr_torrentStop( tor );
-        tor->startAfterVerify = TRUE;
+        tor->startAfterVerify = startAfter;
     }
 
@@ -1701 +1703 @@
 tr_torrentRecheckCompleteness( tr_torrent * tor )
 {
-    tr_bool wasRunning;
     tr_completeness completeness;
 
@@ -1709 +1710 @@
 
     completeness = tr_cpGetStatus( &tor->completion );
-    wasRunning = tor->isRunning;
 
     if( completeness != tor->completeness )
     {
         const int recentChange = tor->downloadedCur != 0;
+        const tr_bool wasLeeching = !tr_torrentIsSeed( tor );
+        const tr_bool wasRunning = tor->isRunning;
 
         if( recentChange )
@@ -1731 +1733 @@
                 tr_announcerTorrentCompleted( tor );
                 tor->doneDate = tor->anyDate = tr_time( );
+            }
+
+            if( wasLeeching && wasRunning )
+            {
+                /* clear interested flag on all peers */
+                tr_peerMgrClearInterest( tor );
+
+                /* if completeness was TR_LEECH then the seed limit check will have been skipped in bandwidthPulse */
+                tr_torrentCheckSeedRatio( tor );
             }