Changeset 2221

Timestamp:

Jun 28, 2007, 5:43:53 PM (16 years ago)

Author:

charles

Message:

• (libT) stopped torrents shouldn't use CPU cycles.
• (gtk) if a torrent is stopped when you exit, keep it stopped when restarting.

Location:

trunk

Files:

• gtk/tr_torrent.c (modified) (4 diffs)
• libtransmission/torrent.c (modified) (3 diffs)

trunk/gtk/tr_torrent.c

@@ -238 +238 @@
 }
 
+static tr_stat_t*
+refreshStat( TrTorrent * tor )
+{
+    tor->lastStatTime= time( NULL );
+    tor->stat = *tr_torrentStat( tor->handle );
+    return &tor->stat;
+}
+
 const tr_stat_t *
 tr_torrent_stat(TrTorrent *tor)
 {
-    const time_t now = time( NULL );
-
     g_assert( TR_IS_TORRENT(tor) );
 
-    if( tor->severed )
-        return NULL;
-
-    if( tor->lastStatTime != now ) {
-        tor->lastStatTime = now;
-        tor->stat = *tr_torrentStat( tor->handle );
-    }
+    if( !tor->severed && tor->lastStatTime!=time(NULL) )
+        refreshStat( tor );
 
     return &tor->stat;
@@ -401 +402 @@
 
   torrent = hash = dir = NULL;
-  paused = FALSE;
 
   for(ii = 0; ii + 1 < state->val.l.count; ii += 2) {
@@ -428 +428 @@
 
   flags = 0;
-  if( forcedpause )
+  if( paused || forcedpause )
       flags |= TR_FLAG_PAUSED;
 
@@ -494 +494 @@
     tr_bencInitStr( tr_bencDictAdd( state, "dir" ),
                     tr_torrentGetFolder( tor->handle ), -1, 1 );
-#if 0
+
     tr_bencInitInt( tr_bencDictAdd( state, "paused" ),
-                    tr_torrent_paused( tor ) ? 1 : 0 );
-#endif
-
+                    (refreshStat(tor)->status & TR_STATUS_INACTIVE) ? 1 : 0);
     tr_bencInitInt( tr_bencDictAdd( state, "ul-cap-speed" ),
                     tor->ul_cap );

trunk/libtransmission/torrent.c

@@ -25 +25 @@
 #include "transmission.h"
 #include "shared.h"
-#define INTERVAL_MSEC 100
 
 /***
@@ -824 +823 @@
     tr_peer_t * otherPeer;
 
+    assert( tor != NULL );
+    assert( peer != NULL );
+
     if( tor->peerCount >= TR_MAX_PEER_COUNT )
     {
@@ -952 +954 @@
 
         /* sleep a little while */
-        tr_wait( INTERVAL_MSEC );
+        tr_wait( tor->runStatus == TR_RUN_STOPPED ? 1000 : 100 );
 
         /* if we're stopping... */