Changeset 7365
- Timestamp:
- Dec 13, 2008, 10:52:13 PM (12 years ago)
- Location:
- branches/1.4x/libtransmission
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.4x/libtransmission/bandwidth.c
r7328 r7365 274 274 275 275 /* notify the io buffers that there's more bandwidth available */ 276 if( !b->band[dir].isLimited || ( b->band[dir].bytesLeft > 0 ) )277 276 { 278 277 int i, n=0; -
branches/1.4x/libtransmission/session.c
r7301 r7365 280 280 281 281 h->bandwidth = tr_bandwidthNew( h, NULL ); 282 tr_ bandwidthSetDesiredSpeed( h->bandwidth, TR_UP,uploadLimit );283 tr_ bandwidthSetDesiredSpeed( h->bandwidth, TR_DOWN, downloadLimit );284 tr_ bandwidthSetLimited( h->bandwidth, TR_UP, useUploadLimit );285 tr_ bandwidthSetLimited( h->bandwidth, TR_DOWN, useDownloadLimit );282 tr_sessionSetSpeedLimit ( h, TR_UP, uploadLimit ); 283 tr_sessionSetSpeedLimitEnabled( h, TR_UP, useUploadLimit ); 284 tr_sessionSetSpeedLimit ( h, TR_DOWN, downloadLimit ); 285 tr_sessionSetSpeedLimitEnabled( h, TR_DOWN, useDownloadLimit ); 286 286 287 287 /* first %s is the application name … … 442 442 ***/ 443 443 444 static void 445 updateBandwidth( tr_session * session, tr_direction dir ) 446 { 447 const tr_bool zeroCase = session->speedLimit[dir] < 1 && session->isSpeedLimited[dir]; 448 449 tr_bandwidthSetLimited( session->bandwidth, dir, session->isSpeedLimited[dir] && !zeroCase ); 450 451 tr_bandwidthSetDesiredSpeed( session->bandwidth, dir, session->speedLimit[dir] ); 452 } 453 444 454 void 445 455 tr_sessionSetSpeedLimitEnabled( tr_session * session, 446 456 tr_direction dir, 447 int isLimited ) 448 { 449 tr_bandwidthSetLimited( session->bandwidth, dir, isLimited ); 450 } 451 452 int 453 tr_sessionIsSpeedLimitEnabled( const tr_session * session, 454 tr_direction dir ) 455 { 456 return tr_bandwidthIsLimited( session->bandwidth, dir ); 457 tr_bool isLimited ) 458 { 459 assert( session ); 460 assert( dir==TR_UP || dir==TR_DOWN ); 461 462 session->isSpeedLimited[dir] = isLimited; 463 updateBandwidth( session, dir ); 457 464 } 458 465 … … 462 469 int desiredSpeed ) 463 470 { 464 tr_bandwidthSetDesiredSpeed( session->bandwidth, dir, desiredSpeed ); 471 assert( session ); 472 assert( dir==TR_UP || dir==TR_DOWN ); 473 474 session->speedLimit[dir] = desiredSpeed; 475 updateBandwidth( session, dir ); 476 } 477 478 tr_bool 479 tr_sessionIsSpeedLimitEnabled( const tr_session * session, 480 tr_direction dir ) 481 { 482 assert( session ); 483 assert( dir==TR_UP || dir==TR_DOWN ); 484 485 return session->isSpeedLimited[dir]; 465 486 } 466 487 … … 469 490 tr_direction dir ) 470 491 { 471 return tr_bandwidthGetDesiredSpeed( session->bandwidth, dir ); 492 assert( session ); 493 assert( dir==TR_UP || dir==TR_DOWN ); 494 495 return session->speedLimit[dir]; 472 496 } 473 497 -
branches/1.4x/libtransmission/session.h
r7176 r7365 64 64 tr_bool isClosed; 65 65 tr_bool useLazyBitfield; 66 67 tr_bool isSpeedLimited[2]; 68 int speedLimit[2]; 66 69 67 70 tr_encryption_mode encryptionMode; -
branches/1.4x/libtransmission/torrent.c
r7330 r7365 182 182 } 183 183 184 int 184 tr_bool 185 185 tr_torrentIsPieceTransferAllowed( const tr_torrent * tor, 186 186 tr_direction direction ) 187 187 { 188 intisEnabled = FALSE;188 tr_bool isEnabled = FALSE; 189 189 190 190 switch( tr_torrentGetSpeedMode( tor, direction ) ) -
branches/1.4x/libtransmission/torrent.h
r7267 r7365 87 87 int tr_torrentAllowsPex( const tr_torrent * ); 88 88 89 inttr_torrentIsPieceTransferAllowed( const tr_torrent * torrent,89 tr_bool tr_torrentIsPieceTransferAllowed( const tr_torrent * torrent, 90 90 tr_direction direction ); 91 91 -
branches/1.4x/libtransmission/transmission.h
r7180 r7365 554 554 tr_direction; 555 555 556 void tr_sessionSetSpeedLimitEnabled( tr_session * session, 557 tr_direction direction, 558 int isEnabled ); 559 560 double tr_sessionGetRawSpeed( const tr_session * session, 561 tr_direction direection ); 562 563 double tr_sessionGetPieceSpeed( const tr_session * session, 564 tr_direction direection ); 565 566 int tr_sessionIsSpeedLimitEnabled( const tr_session * session, 567 tr_direction direction ); 568 569 void tr_sessionSetSpeedLimit( tr_session * session, 570 tr_direction direction, 571 int KiB_sec ); 572 573 int tr_sessionGetSpeedLimit( const tr_session * session, 574 tr_direction direction ); 556 void tr_sessionSetSpeedLimitEnabled ( tr_session * session, 557 tr_direction direction, 558 tr_bool isEnabled ); 559 560 tr_bool tr_sessionIsSpeedLimitEnabled ( const tr_session * session, 561 tr_direction direction ); 562 563 void tr_sessionSetSpeedLimit ( tr_session * session, 564 tr_direction direction, 565 int KiB_sec ); 566 567 int tr_sessionGetSpeedLimit ( const tr_session * session, 568 tr_direction direction ); 569 570 double tr_sessionGetRawSpeed ( const tr_session * session, 571 tr_direction direction ); 572 573 double tr_sessionGetPieceSpeed ( const tr_session * session, 574 tr_direction direction ); 575 575 576 576 577 void tr_sessionSetPeerLimit( tr_session * session,
Note: See TracChangeset
for help on using the changeset viewer.