monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix time comparison math

Browse source 
Dividing `dt` here by 1e6 converts it to seconds, but that is clearly
wrong since `REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY` is measured
in microseconds.  As a result, this if statement was effectively never
used.
This commit is contained in:
Jason Rhinelander 2019-12-05 21:02:18 -04:00
parent 411f1b0ee3
commit 72ca7e3b0f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -1673,9 +1673,9 @@ skip:
const float max_multiplier = 10.f; const float max_multiplier = 10.f;
const float min_multiplier = 1.25f; const float min_multiplier = 1.25f;
float multiplier = max_multiplier; float multiplier = max_multiplier;
if (dt/1e6 >= REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY) if (dt >= REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY)
{ {
multiplier = max_multiplier - (dt/1e6-REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY) * (max_multiplier - min_multiplier) / (REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD - REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY); multiplier = max_multiplier - (dt-REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY) * (max_multiplier - min_multiplier) / (REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD - REQUEST_NEXT_SCHEDULED_SPAN_THRESHOLD_STANDBY);
multiplier = std::min(max_multiplier, std::max(min_multiplier, multiplier)); multiplier = std::min(max_multiplier, std::max(min_multiplier, multiplier));
} }
if (dl_speed * .8f > ctx.m_current_speed_down * multiplier) if (dl_speed * .8f > ctx.m_current_speed_down * multiplier)