Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed the "emergency shutdown" feature in tickPeerTransfer(), that would stuck some transfers on the lowest rate 128 B/s. On my tests this emergency shutdown is never needed.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3676 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-10-16 21:09:48 +00:00
parent 630e7dfe6b
commit af8ad4e862
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libretroshare/src/ft/fttransfermodule.cc
View File

@ -871,17 +871,22 @@ bool ftTransferModule::locked_tickPeerTransfer(peerInfo &info)
/* emergency shutdown if we are stuck in x 1.25 mode
* probably not needed
*/
if ((info.rttActive) && (ts - info.rttStart > FT_TM_SLOW_RTT))
{
if (info.mRateIncrease > 0)
{
#ifdef FT_DEBUG
std::cerr << "!!! - Emergency shutdown because rttActive is true, and age is " << ts - info.rttStart << std::endl ;
#endif
info.mRateIncrease = 0;
info.rttActive = false ; // I've added this to avoid being stuck when rttActive is true
}
}
// csoler: I commented this out because that tends to make some sources
// get stuck into minimal 128 B/s rate, when multiple sources are competiting into the
// same limited bandwidth. I don't think this emergency shutdown is necessary anyway.
//
// if ((info.rttActive) && (ts - info.rttStart > FT_TM_SLOW_RTT))
// {
// if (info.mRateIncrease > 0)
// {
//#ifdef FT_DEBUG
// std::cerr << "!!! - Emergency shutdown because rttActive is true, and age is " << ts - info.rttStart << std::endl ;
//#endif
// info.mRateIncrease = 0;
// info.rttActive = false ; // I've added this to avoid being stuck when rttActive is true
// }
// }
/* request at more than current rate */
uint32_t next_req = info.actualRate * (1.0 + info.mRateIncrease);