Changeset 2423

Timestamp:

Jul 19, 2007, 3:48:27 AM (16 years ago)

Author:

charles

Message:

add extra state change checks

File:

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

trunk/libtransmission/torrent.c

@@ -983 +983 @@
 
 static void
+recheckCpState( tr_torrent_t * tor )
+{
+    cp_status_t cpStatus;
+
+    tr_torrentWriterLock( tor );
+
+    cpStatus = tr_cpGetStatus( tor->completion );
+    if( cpStatus != tor->cpStatus ) {
+        tor->cpStatus = cpStatus;
+        tor->hasChangedState = tor->cpStatus;  /* tell the client... */
+        if( (cpStatus == TR_CP_COMPLETE) /* ...and if we're complete */
+            && tor->tracker!=NULL           /* and we have a tracker */
+            && tor->downloadedCur ) {        /* and it just happened */
+            tr_trackerCompleted( tor->tracker ); /* tell the tracker */
+        }
+        tr_ioSync( tor->io );
+    }
+    tr_torrentWriterUnlock( tor );
+}
+
+static void
 torrentThreadLoop ( void * _tor )
 {
@@ -998 +1019 @@
     while( ! ( tor->dieFlag && (tor->runStatus == TR_RUN_STOPPED) ) )
     {
-        cp_status_t cpStatus;
-
         /* sleep a little while */
         tr_wait( tor->runStatus == TR_RUN_STOPPED ? 1600 : 600 );
 
-        if( tor->fastResumeDirty ) {
+        if( tor->fastResumeDirty )
+        {
             tor->fastResumeDirty = FALSE;
             fastResumeSave( tor );
+            recheckCpState( tor );
         }
 
@@ -1109 +1130 @@
 
             /* refresh our completion state */
-            tr_torrentWriterLock( tor );
-            cpStatus = tr_cpGetStatus( tor->completion );
-            if( cpStatus != tor->cpStatus ) {
-                tor->cpStatus = cpStatus;
-                tor->hasChangedState = tor->cpStatus;  /* tell the client... */
-                if( (cpStatus == TR_CP_COMPLETE) /* ...and if we're complete */
-                    && tor->tracker!=NULL           /* and we have a tracker */
-                    && tor->downloadedCur ) {        /* and it just happened */
-                    tr_trackerCompleted( tor->tracker ); /* tell the tracker */
-                }
-                tr_ioSync( tor->io );
-            }
-            tr_torrentWriterUnlock( tor );
+            recheckCpState( tor );
 
             /* ping the tracker... */