mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-21 07:20:28 -04:00
Updated version numbers to v0.4.11b.
Bugfixes for 'sleep' issues under windows. Extra debugging for transfer module. Fixed channel directory creation. (extra 'break' statement) Fixed very slow transfers on Windows platform (uninitialised variable) Ready for win/linux/osx release now. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
4610d1ddac
commit
83720439f0
8 changed files with 77 additions and 11 deletions
|
@ -602,18 +602,47 @@ bool ftTransferModule::locked_tickPeerTransfer(peerInfo &info)
|
|||
|
||||
/* request at more than current rate */
|
||||
uint32_t next_req = info.actualRate * (1.0 + info.mRateIncrease);
|
||||
#ifdef FT_DEBUG
|
||||
|
||||
std::cerr << "locked_tickPeerTransfer() actual rate: " << actualRate;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
if (next_req > info.desiredRate * 1.1)
|
||||
{
|
||||
next_req = info.desiredRate * 1.1;
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "locked_tickPeerTransfer() Reached MaxRate: next_req: " << next_req;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
if (next_req > FT_TM_MAX_PEER_RATE)
|
||||
{
|
||||
next_req = FT_TM_MAX_PEER_RATE;
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "locked_tickPeerTransfer() Reached AbsMaxRate: next_req: " << next_req;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
if (next_req < FT_TM_MINIMUM_CHUNK)
|
||||
{
|
||||
next_req = FT_TM_MINIMUM_CHUNK;
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "locked_tickPeerTransfer() small chunk: next_req: " << next_req;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
}
|
||||
|
||||
info.lastTS = ts;
|
||||
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "locked_tickPeerTransfer() desired next_req: " << next_req;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* do request */
|
||||
uint64_t req_offset = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue