Changeset 3032

Timestamp:

Sep 10, 2007, 7:05:05 PM (15 years ago)

Author:

charles

Message:

• get torrent-stopping working a little better.
• tr_torrentStop() now works for torrents being checked or queued to be checked

File:

• branches/encryption/libtransmission/torrent.c (modified) (7 diffs)

branches/encryption/libtransmission/torrent.c

@@ -149 +149 @@
 ***/
 
-static void tr_torrentHasStopped( tr_torrent * );
-
 static void
 onTrackerResponse( void * tracker UNUSED, void * vevent, void * user_data )
@@ -180 +178 @@
 
         case TR_TRACKER_STOPPED:
-            assert( tor->runStatus == TR_RUN_STOPPING_NET_WAIT );
-            tr_torrentHasStopped( tor );
+            assert( tor->runStatus == TR_RUN_STOPPING );
+            tor->runStatus = TR_RUN_STOPPED;
             break;
     }
@@ -786 +784 @@
         case TR_RUN_CHECKING_WAIT: s->status = TR_STATUS_CHECK_WAIT; break;
         case TR_RUN_CHECKING: s->status = TR_STATUS_CHECK; break;
-        case TR_RUN_STOPPING: /* fallthrough */
-        case TR_RUN_STOPPING_NET_WAIT: s->status = TR_STATUS_STOPPING; break;
+        case TR_RUN_STOPPING: s->status = TR_STATUS_STOPPING; break;
         case TR_RUN_STOPPED: s->status = TR_STATUS_STOPPED; break;
         case TR_RUN_RUNNING: switch( tor->cpStatus ) {
@@ -1025 +1022 @@
     tr_info_t * inf = &tor->info;
 
+    assert( tor != NULL );
+    assert( tor->runStatus == TR_RUN_STOPPED );
+
     tr_sharedLock( h->shared );
 
@@ -1063 +1063 @@
 }
 
-static void
-tr_torrentHasStopped( tr_torrent * tor )
-{
-    /* close the IO */
-    tr_ioClose( tor );
-    saveFastResumeNow( tor );
-
-    /* free everything */
-    if( tor->dieFlag )
-        tr_torrentFree( tor );
+static int
+freeWhenStopped( void * vtor )
+{
+    tr_torrent * tor = vtor;
+
+    if( tor->runStatus != TR_RUN_STOPPED ) /* keep waiting */
+        return TRUE;
+
+    tr_torrentFree( tor );
+    return FALSE;
 }
 
@@ -1078 +1078 @@
 tr_torrentStop( tr_torrent * tor )
 {
-    if( tor->runStatus==TR_RUN_STOPPING || tor->runStatus==TR_RUN_STOPPED )
-        return;
-
-    /* close the peers */
-    tr_peerMgrStopTorrent( tor->handle->peerMgr, tor->info.hash );
-
-    /* tell the tracker we're stopping */
-    tor->runStatus = TR_RUN_STOPPING_NET_WAIT;
-    tor->stopDate = tr_date();
-    tr_trackerStop( tor->tracker );
-}
-
-void tr_torrentClose( tr_torrent * tor )
+    switch( tor->runStatus )
+    {
+        case TR_RUN_CHECKING_WAIT:
+        case TR_RUN_CHECKING:
+            tr_ioRecheckRemove( tor );
+            tr_torrentStop( tor );
+            break;
+
+        case TR_RUN_RUNNING:
+            saveFastResumeNow( tor );
+            tr_peerMgrStopTorrent( tor->handle->peerMgr, tor->info.hash );
+            tor->runStatus = TR_RUN_STOPPING;
+            tor->stopDate = tr_date( );
+            tr_trackerStop( tor->tracker );
+            tr_ioClose( tor );
+            break;
+
+        case TR_RUN_STOPPING:
+        case TR_RUN_STOPPED:
+            break;
+    }
+}
+
+void
+tr_torrentClose( tr_torrent * tor )
 {
     tor->runStatusToSave = tor->runStatus;
@@ -1096 +1108 @@
     tor->dieFlag = TRUE;
     tr_torrentStop( tor );
+    tr_timerNew( tor->handle, freeWhenStopped, tor, NULL, 100 );
 }