Changeset 3469

Timestamp:

Oct 19, 2007, 11:23:21 PM (15 years ago)

Author:

charles

Message:

• don't fire the "status changed" event if the status changes while a torrent's being started for the first time.
• cleaner setting of the DND flags in the gtk+ client.
• cpStatus cleanup.

Location:

trunk

Files:

• gtk/torrent-inspector.c (modified) (2 diffs)
• libtransmission/internal.h (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (3 diffs)
• libtransmission/peer-msgs.c (modified) (2 diffs)
• libtransmission/torrent.c (modified) (7 diffs)
• libtransmission/transmission.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)

trunk/gtk/torrent-inspector.c

@@ -1177 +1177 @@
 
 static void
-set_files_enabled( GtkTreeStore   * store,
-                   GtkTreeIter    * iter,
-                   tr_torrent     * tor,
-                   gboolean         enabled )
+subtree_walk_dnd( GtkTreeStore   * store,
+                  GtkTreeIter    * iter,
+                  tr_torrent     * tor,
+                  gboolean         enabled,
+                  GArray         * indices )
 {
     int index;
     GtkTreeIter child;
-
+ 
+    /* update this node */ 
     gtk_tree_model_get( GTK_TREE_MODEL(store), iter, FC_INDEX, &index, -1  );
     if (index >= 0)
-      tr_torrentSetFileDL( tor, index, enabled );
+      g_array_append_val( indices, index );
     gtk_tree_store_set( store, iter, FC_ENABLED, enabled, -1 );
 
+    /* visit the children */
     if( gtk_tree_model_iter_children( GTK_TREE_MODEL(store), &child, iter ) ) do
-      set_files_enabled( store, &child, tor, enabled );
+      subtree_walk_dnd( store, &child, tor, enabled, indices );
     while( gtk_tree_model_iter_next( GTK_TREE_MODEL(store), &child ) );
+}
+
+static void
+set_subtree_dnd( GtkTreeStore * store,
+                 GtkTreeIter * iter,
+                 tr_torrent  * tor,
+                 gboolean enabled )
+{
+    GArray * indices = g_array_new( FALSE, FALSE, sizeof(int) );
+    subtree_walk_dnd( store, iter, tor, enabled, indices );
+    tr_torrentSetFileDLs( tor, (int*)indices->data, (int)indices->len, enabled );
+    g_array_free( indices, TRUE );
 }
 
@@ -1285 +1300 @@
   gtk_tree_model_get( model, &iter, FC_ENABLED, &enabled, -1 );
   enabled = !enabled;
-  set_files_enabled( GTK_TREE_STORE(model),
-                     &iter,
-                     tr_torrent_handle( data->gtor ),
-                     enabled );
+  set_subtree_dnd( GTK_TREE_STORE(model),
+                   &iter,
+                   tr_torrent_handle( data->gtor ),
+                   enabled );
 
   gtk_tree_path_free( path );

trunk/libtransmission/internal.h

@@ -62 +62 @@
 void tr_torrentUnlock  ( const tr_torrent * );
 
+int  tr_torrentIsSeed  ( const tr_torrent * );
+
 void tr_torrentChangeMyPort  ( tr_torrent * );
 

trunk/libtransmission/peer-mgr.c

@@ -705 +705 @@
     if( !t->isRunning )
         return TRUE;
-    if( tr_cpGetStatus( t->tor->completion ) != TR_CP_INCOMPLETE )
+    if( tr_torrentIsSeed( t->tor ) )
         return TRUE;
 
@@ -1503 +1503 @@
     /* if we're both seeds and it's been long enough for a pex exchange, close it */
     if( 1 ) {
-        const int clientIsSeed = tr_cpGetStatus( tor->completion ) != TR_CP_INCOMPLETE;
+        const int clientIsSeed = tr_torrentIsSeed( tor );
         const int peerIsSeed = atom->flags & ADDED_F_SEED_FLAG;
         if( peerIsSeed && clientIsSeed && ( !tr_torrentIsPexEnabled(tor) || (now-atom->time>=30) ) ) {
@@ -1569 +1569 @@
     struct peer_atom ** ret;
     const time_t now = time( NULL );
-    const int seed = tr_cpGetStatus( t->tor->completion ) != TR_CP_INCOMPLETE;
+    const int seed = tr_torrentIsSeed( t->tor );
 
     assert( torrentIsLocked( t ) );

trunk/libtransmission/peer-msgs.c

@@ -344 +344 @@
     const tr_torrent * torrent;
     const tr_bitfield * bitfield;
-    const int clientIsSeed =
-        tr_cpGetStatus( msgs->torrent->completion ) != TR_CP_INCOMPLETE;
+    const int clientIsSeed = tr_torrentIsSeed( msgs->torrent );
 
     if( clientIsSeed )
@@ -950 +949 @@
 
         case BT_BITFIELD: {
-            const int clientIsSeed = tr_cpGetStatus( msgs->torrent->completion ) != TR_CP_INCOMPLETE;
+            const int clientIsSeed = tr_torrentIsSeed( msgs->torrent );
             dbgmsg( msgs, "got a bitfield" );
             assert( msglen == msgs->info->have->len );

trunk/libtransmission/torrent.c

@@ -590 +590 @@
 ***/
 
-#if 0
-int tr_torrentScrape( tr_torrent * tor, int * s, int * l, int * d )
-{
-    return tr_trackerScrape( tor, s, l, d );
-}
-#endif
-
 static int
 saveFastResumeNow( void * vtor )
 {
     tr_torrent * tor = (tr_torrent *) vtor;
-
     tr_fastResumeSave( tor );
-    tr_torrentRecheckCompleteness( tor );
-
-    tr_timerFree( &tor->saveTimer );
+    tor->saveTimer = NULL;
     return FALSE;
 }
@@ -1004 +994 @@
     *tor->errorString = '\0';
     tr_torrentResetTransferStats( tor );
-    tr_torrentRecheckCompleteness( tor );
+    tor->cpStatus = tr_cpGetStatus( tor->completion );
+    saveFastResumeSoon( tor );
     tor->startDate = tr_date( );
     tr_trackerStart( tor->tracker );
@@ -1134 +1125 @@
 }
 
+int
+tr_torrentIsSeed( const tr_torrent * tor )
+{
+    return tor->cpStatus==TR_CP_COMPLETE || tor->cpStatus==TR_CP_DONE;
+}
+
 /**
 ***  File priorities
@@ -1224 +1221 @@
 }
 
-void
-tr_torrentSetFileDL( tr_torrent  * tor,
-                     int           fileIndex,
-                     int           doDownload )
+static void
+setFileDND( tr_torrent  * tor,
+            int           fileIndex,
+            int           doDownload )
 {
     tr_file * file;
@@ -1234 +1231 @@
     int lastPiece, lastPieceDND;
     int i;
-
-    tr_torrentLock( tor );
 
     file = &tor->info.files[fileIndex];
@@ -1271 +1266 @@
             tor->info.pieces[i].dnd = dnd;
     }
-
-    tr_cpInvalidateDND ( tor->completion );
-
-    saveFastResumeSoon( tor );
-
-    tr_torrentUnlock( tor );
 }
 
@@ -1286 +1275 @@
 {
     int i;
+    tr_torrentLock( tor );
+
     for( i=0; i<fileCount; ++i )
-        tr_torrentSetFileDL( tor, files[i], doDownload );
+        setFileDND( tor, files[i], doDownload );
+    tr_cpInvalidateDND ( tor->completion );
+    saveFastResumeNow( tor );
+
+    tr_torrentUnlock( tor );
 }
 

trunk/libtransmission/transmission.c

@@ -263 +263 @@
 {
     tr_torrent * tor;
-
-    *dl = 0.0;
-    *ul = 0.0;
     tr_globalLock( h );
+
+    *dl = *ul = 0.0;
     for( tor = h->torrentList; tor; tor = tor->next )
     {
-        tr_torrentLock( tor );
-        if( tor->cpStatus == TR_CP_INCOMPLETE )
-            *dl += tr_rcRate( tor->download );
+        *dl += tr_rcRate( tor->download );
         *ul += tr_rcRate( tor->upload );
-        tr_torrentUnlock( tor );
-    }
+    }
+
     tr_globalUnlock( h );
 }

trunk/libtransmission/transmission.h

@@ -286 +286 @@
 /* set a batch of files to be downloaded or not. */
 void tr_torrentSetFileDLs ( tr_torrent   * tor,
-                            int            * files,
-                            int              fileCount,
-                            int              do_download );
-
-/* single-file form of tr_torrentSetFileDLs */
-void tr_torrentSetFileDL( tr_torrent *, int file, int do_download );
+                            int          * files,
+                            int            fileCount,
+                            int            do_download );
 
 /***********************************************************************