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

restore smooth increase of up bw, and restore the use of the maximum down bw advertised by peer via BwCtrl

Browse Source
This commit is contained in:
jolavillette 2021-01-12 10:08:17 +01:00
parent 45a1c7af24
commit df7de80914
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/pqi/pqihandler.cc
View File

@ -406,8 +406,8 @@ int pqihandler::UpdateRates()
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates mod_index " << mod_index << " out_max_bw " << out_max_bw << " remaining out bw " << out_remaining_bw << std::endl; RsDbg() << "UPDATE_RATES pqihandler::UpdateRates mod_index " << mod_index << " out_max_bw " << out_max_bw << " remaining out bw " << out_remaining_bw << std::endl;
#endif #endif
/* Allocate only half the remaining out bw, if any, to make it smoother */ /* Allocate only 50 pct the remaining out bw, if any, to make the transition more smooth */
out_max_bw = out_max_bw + out_remaining_bw / 2; out_max_bw = out_max_bw + 0.5 * out_remaining_bw;
/* Calculate the optimal in_max value, taking into account avail_in and the in bw requested by modules */ /* Calculate the optimal in_max value, taking into account avail_in and the in bw requested by modules */
@ -437,8 +437,8 @@ int pqihandler::UpdateRates()
RsDbg() << "UPDATE_RATES pqihandler::UpdateRates mod_index " << mod_index << " in_max_bw " << in_max_bw << " remaining in bw " << in_remaining_bw << std::endl; RsDbg() << "UPDATE_RATES pqihandler::UpdateRates mod_index " << mod_index << " in_max_bw " << in_max_bw << " remaining in bw " << in_remaining_bw << std::endl;
#endif #endif
// allocate all remaining in bw // allocate only 75 pct of the remaining in bw, to make the transition more smooth
in_max_bw = in_max_bw + in_remaining_bw; in_max_bw = in_max_bw + 0.75 * in_remaining_bw;
// store current total in and out used bw // store current total in and out used bw
locked_StoreCurrentRates(used_bw_in, used_bw_out); locked_StoreCurrentRates(used_bw_in, used_bw_out);
@ -474,8 +474,8 @@ int pqihandler::UpdateRates()
{ {
if (rateMap_it->second.mAllowedOut > 0) if (rateMap_it->second.mAllowedOut > 0)
{ {
if (out_max_bw > 0.95 * rateMap_it->second.mAllowedOut) if (out_max_bw > rateMap_it->second.mAllowedOut)
mod -> pqi -> setMaxRate(false, 0.95 * rateMap_it->second.mAllowedOut); mod -> pqi -> setMaxRate(false, rateMap_it->second.mAllowedOut);
else else
mod -> pqi -> setMaxRate(false, out_max_bw); mod -> pqi -> setMaxRate(false, out_max_bw);
} }