Changeset 12640

Timestamp:

Aug 7, 2011, 7:24:33 PM (12 years ago)

Author:

jordan

Message:

Add a mechanism for enabling/disabling the stalled minutes feature. This is a pre-existing feature in the Mac client.

Location:

trunk/libtransmission

Files:

• rpcimpl.c (modified) (2 diffs)
• session.c (modified) (4 diffs)
• session.h (modified) (1 diff)
• torrent.c (modified) (1 diff)
• transmission.h (modified) (3 diffs)

trunk/libtransmission/rpcimpl.c

@@ -1560 +1560 @@
     if( tr_bencDictFindStr( args_in, TR_PREFS_KEY_DOWNLOAD_DIR, &str ) )
         tr_sessionSetDownloadDir( session, str );
+    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_QUEUE_STALLED_MINUTES, &i ) )
+        tr_sessionSetQueueStalledMinutes( session, i );
+    if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_QUEUE_STALLED_ENABLED, &boolVal ) )
+        tr_sessionSetQueueStalledEnabled( session, boolVal );
+    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_DOWNLOAD_QUEUE_SIZE, &i ) )
+        tr_sessionSetQueueSize( session, TR_DOWN, i );
     if( tr_bencDictFindBool( args_in, TR_PREFS_KEY_DOWNLOAD_QUEUE_ENABLED, &boolVal ) )
         tr_sessionSetQueueEnabled ( session, TR_DOWN, boolVal );
-    if( tr_bencDictFindInt( args_in, TR_PREFS_KEY_DOWNLOAD_QUEUE_SIZE, &i ) )
-        tr_sessionSetQueueSize( session, TR_DOWN, i );
     if( tr_bencDictFindStr( args_in, TR_PREFS_KEY_INCOMPLETE_DIR, &str ) )
         tr_sessionSetIncompleteDir( session, str );
@@ -1731 +1735 @@
     tr_bencDictAddStr ( d, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_FILENAME, tr_sessionGetTorrentDoneScript( s ) );
     tr_bencDictAddBool( d, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_ENABLED, tr_sessionIsTorrentDoneScriptEnabled( s ) );
+    tr_bencDictAddInt ( d, TR_PREFS_KEY_QUEUE_STALLED_MINUTES, tr_sessionGetQueueStalledMinutes( s ) );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_QUEUE_STALLED_ENABLED, tr_sessionGetQueueStalledEnabled( s ) );
     tr_formatter_get_units( tr_bencDictAddDict( d, "units", 0 ) );
     tr_bencDictAddStr ( d, "version", LONG_VERSION_STRING );

trunk/libtransmission/session.c

@@ -333 +333 @@
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PREALLOCATION,                   TR_PREALLOCATE_SPARSE );
     tr_bencDictAddBool( d, TR_PREFS_KEY_PREFETCH_ENABLED,                DEFAULT_PREFETCH_ENABLED );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_QUEUE_STALLED_ENABLED,           true );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_QUEUE_STALLED_MINUTES,           30 );
     tr_bencDictAddReal( d, TR_PREFS_KEY_RATIO,                           2.0 );
@@ -403 +404 @@
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PREALLOCATION,                    s->preallocationMode );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_PREFETCH_ENABLED,                 s->isPrefetchEnabled );
+    tr_bencDictAddBool( d, TR_PREFS_KEY_QUEUE_STALLED_ENABLED,            tr_sessionGetQueueStalledEnabled( s ) );
     tr_bencDictAddInt ( d, TR_PREFS_KEY_QUEUE_STALLED_MINUTES,            tr_sessionGetQueueStalledMinutes( s ) );
     tr_bencDictAddReal( d, TR_PREFS_KEY_RATIO,                            s->desiredRatio );
@@ -793 +795 @@
     if( tr_bencDictFindInt( settings, TR_PREFS_KEY_QUEUE_STALLED_MINUTES, &i ) )
         tr_sessionSetQueueStalledMinutes( session, i );
+    if( tr_bencDictFindBool( settings, TR_PREFS_KEY_QUEUE_STALLED_ENABLED, &boolVal ) )
+        tr_sessionSetQueueStalledEnabled( session, boolVal );
     if( tr_bencDictFindInt( settings, TR_PREFS_KEY_DOWNLOAD_QUEUE_SIZE, &i ) )
         tr_sessionSetQueueSize( session, TR_DOWN, i );
@@ -2675 +2679 @@
 }
 
+void
+tr_sessionSetQueueStalledEnabled( tr_session * session, bool is_enabled )
+{
+    assert( tr_isSession( session ) );
+    assert( tr_isBool( is_enabled ) );
+
+    session->stalledEnabled = is_enabled;
+}
+  
+bool
+tr_sessionGetQueueStalledEnabled( const tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
+    return session->stalledEnabled;
+}
+
 int
 tr_sessionGetQueueStalledMinutes( const tr_session * session )

trunk/libtransmission/session.h

@@ -112 +112 @@
     tr_benc                      removedTorrents;
 
+    bool                         stalledEnabled;
     bool                         queueEnabled[2];
     int                          queueSize[2];

trunk/libtransmission/torrent.c

@@ -1142 +1142 @@
 tr_torrentIsStalled( const tr_torrent * tor )
 {
-    return torrentGetIdleSecs( tor ) > ( tr_sessionGetQueueStalledMinutes( tor->session ) * 60 );
+    return tr_sessionGetQueueStalledEnabled( tor->session )
+        && ( torrentGetIdleSecs( tor ) > ( tr_sessionGetQueueStalledMinutes( tor->session ) * 60 ) );
 }
 

trunk/libtransmission/transmission.h

@@ -210 +210 @@
 #define TR_PREFS_KEY_SEED_QUEUE_ENABLED                 "seed-queue-enabled"
 #define TR_PREFS_KEY_RPC_WHITELIST                      "rpc-whitelist"
+#define TR_PREFS_KEY_QUEUE_STALLED_ENABLED              "queue-stalled-enabled"
 #define TR_PREFS_KEY_QUEUE_STALLED_MINUTES              "queue-stalled-minutes"
 #define TR_PREFS_KEY_DSPEED_KBps                        "speed-limit-down"
@@ -802 +803 @@
 bool tr_sessionGetQueueEnabled  ( const tr_session *, tr_direction );
 
+/**
+**/
+
 /** @brief Consider torrent as 'stalled' when it's been inactive for N minutes.
     Stalled torrents are left running but are not counted by tr_sessionGetQueueSize(). */
@@ -808 +812 @@
 /** @return the number of minutes a torrent can be idle before being considered as stalled */
 int  tr_sessionGetQueueStalledMinutes( const tr_session * );
+
+/** @brief Set whether or not to count torrents idle for over N minutes as 'stalled' */
+void tr_sessionSetQueueStalledEnabled( tr_session *, bool );
+
+/** @return true if we're torrents idle for over N minutes will be flagged as 'stalled' */
+bool tr_sessionGetQueueStalledEnabled( const tr_session * );
+
+/**
+**/
 
 /** @brief Set a callback that is invoked when the queue starts a torrent */