Changeset 7365

Timestamp:

Dec 13, 2008, 10:52:13 PM (12 years ago)

Author:

charles

Message:

(1.4x libT) #1593: Setting upload to 0 kills all download

Location:

branches/1.4x/libtransmission

Files:

• bandwidth.c (modified) (1 diff)
• session.c (modified) (4 diffs)
• session.h (modified) (1 diff)
• torrent.c (modified) (1 diff)
• torrent.h (modified) (1 diff)
• transmission.h (modified) (1 diff)

branches/1.4x/libtransmission/bandwidth.c

@@ -274 +274 @@
 
     /* notify the io buffers that there's more bandwidth available */
-    if( !b->band[dir].isLimited || ( b->band[dir].bytesLeft > 0 ) )
     {
         int i, n=0;

branches/1.4x/libtransmission/session.c

@@ -280 +280 @@
 
     h->bandwidth = tr_bandwidthNew( h, NULL );
-    tr_bandwidthSetDesiredSpeed( h->bandwidth, TR_UP, uploadLimit );
-    tr_bandwidthSetDesiredSpeed( h->bandwidth, TR_DOWN, downloadLimit );
-    tr_bandwidthSetLimited( h->bandwidth, TR_UP, useUploadLimit );
-    tr_bandwidthSetLimited( h->bandwidth, TR_DOWN, useDownloadLimit );
+    tr_sessionSetSpeedLimit       ( h, TR_UP,   uploadLimit );
+    tr_sessionSetSpeedLimitEnabled( h, TR_UP,   useUploadLimit );
+    tr_sessionSetSpeedLimit       ( h, TR_DOWN, downloadLimit );
+    tr_sessionSetSpeedLimitEnabled( h, TR_DOWN, useDownloadLimit );
 
     /* first %s is the application name
@@ -442 +442 @@
 ***/
 
+static void
+updateBandwidth( tr_session * session, tr_direction dir )
+{
+    const tr_bool zeroCase = session->speedLimit[dir] < 1 && session->isSpeedLimited[dir];
+
+    tr_bandwidthSetLimited( session->bandwidth, dir, session->isSpeedLimited[dir] && !zeroCase );
+
+    tr_bandwidthSetDesiredSpeed( session->bandwidth, dir, session->speedLimit[dir] );
+}
+
 void
 tr_sessionSetSpeedLimitEnabled( tr_session      * session,
                                 tr_direction      dir,
-                                int               isLimited )
-{
-    tr_bandwidthSetLimited( session->bandwidth, dir, isLimited );
-}
-
-int
-tr_sessionIsSpeedLimitEnabled( const tr_session  * session,
-                               tr_direction        dir )
-{
-    return tr_bandwidthIsLimited( session->bandwidth, dir );
+                                tr_bool           isLimited )
+{
+    assert( session );
+    assert( dir==TR_UP || dir==TR_DOWN );
+
+    session->isSpeedLimited[dir] = isLimited;
+    updateBandwidth( session, dir );
 }
 
@@ -462 +469 @@
                          int             desiredSpeed )
 {
-    tr_bandwidthSetDesiredSpeed( session->bandwidth, dir, desiredSpeed );
+    assert( session );
+    assert( dir==TR_UP || dir==TR_DOWN );
+
+    session->speedLimit[dir] = desiredSpeed;
+    updateBandwidth( session, dir );
+}
+
+tr_bool
+tr_sessionIsSpeedLimitEnabled( const tr_session  * session,
+                               tr_direction        dir )
+{
+    assert( session );
+    assert( dir==TR_UP || dir==TR_DOWN );
+
+    return session->isSpeedLimited[dir];
 }
 
@@ -469 +490 @@
                          tr_direction        dir )
 {
-    return tr_bandwidthGetDesiredSpeed( session->bandwidth, dir );
+    assert( session );
+    assert( dir==TR_UP || dir==TR_DOWN );
+
+    return session->speedLimit[dir];
 }
 

branches/1.4x/libtransmission/session.h

@@ -64 +64 @@
     tr_bool                      isClosed;
     tr_bool                      useLazyBitfield;
+
+    tr_bool                      isSpeedLimited[2];
+    int                          speedLimit[2];
 
     tr_encryption_mode           encryptionMode;

branches/1.4x/libtransmission/torrent.c

@@ -182 +182 @@
 }
 
-int
+tr_bool
 tr_torrentIsPieceTransferAllowed( const tr_torrent  * tor,
                                   tr_direction        direction )
 {
-    int isEnabled = FALSE;
+    tr_bool isEnabled = FALSE;
 
     switch( tr_torrentGetSpeedMode( tor, direction ) )

branches/1.4x/libtransmission/torrent.h

@@ -87 +87 @@
 int         tr_torrentAllowsPex( const tr_torrent * );
 
-int         tr_torrentIsPieceTransferAllowed( const tr_torrent * torrent,
+tr_bool     tr_torrentIsPieceTransferAllowed( const tr_torrent * torrent,
                                               tr_direction       direction );
 

branches/1.4x/libtransmission/transmission.h

@@ -554 +554 @@
 tr_direction;
 
-void       tr_sessionSetSpeedLimitEnabled( tr_session    * session,
-                                           tr_direction    direction,
-                                           int             isEnabled );
-
-double     tr_sessionGetRawSpeed( const tr_session  * session,
-                                  tr_direction        direection );
-
-double     tr_sessionGetPieceSpeed( const tr_session  * session,
-                                    tr_direction        direection );
-
-int        tr_sessionIsSpeedLimitEnabled( const tr_session  * session,
-                                          tr_direction       direction );
-
-void       tr_sessionSetSpeedLimit( tr_session     * session,
-                                    tr_direction     direction,
-                                    int              KiB_sec );
-
-int        tr_sessionGetSpeedLimit( const tr_session  * session,
-                                    tr_direction        direction );
+void       tr_sessionSetSpeedLimitEnabled ( tr_session        * session,
+                                            tr_direction        direction,
+                                            tr_bool             isEnabled );
+
+tr_bool    tr_sessionIsSpeedLimitEnabled  ( const tr_session  * session,
+                                            tr_direction        direction );
+
+void       tr_sessionSetSpeedLimit        ( tr_session        * session,
+                                            tr_direction        direction,
+                                            int                 KiB_sec );
+
+int        tr_sessionGetSpeedLimit        ( const tr_session  * session,
+                                            tr_direction        direction );
+
+double     tr_sessionGetRawSpeed          ( const tr_session  * session,
+                                           tr_direction         direction );
+
+double     tr_sessionGetPieceSpeed        ( const tr_session  * session,
+                                            tr_direction        direction );
+
 
 void       tr_sessionSetPeerLimit( tr_session  * session,