echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Profiles: Limit average speed calculation to max high cap peers

Browse Source 
Make reorganize() methods pkg private
This commit is contained in:
zzz
2020-02-29 13:44:42 +00:00
parent c190ddd6b0
commit 0b9babab42
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
View File

@ -782,9 +782,9 @@ public class ProfileOrganizer {
* this method, but the averages are recalculated. * this method, but the averages are recalculated.
* *
*/ */
public void reorganize() { reorganize(false); } void reorganize() { reorganize(false); }
public void reorganize(boolean shouldCoalesce) { void reorganize(boolean shouldCoalesce) {
long sortTime = 0; long sortTime = 0;
int coalesceTime = 0; int coalesceTime = 0;
long thresholdTime = 0; long thresholdTime = 0;
@ -1145,7 +1145,7 @@ public class ProfileOrganizer {
} }
/** /**
* Update the _thresholdSpeedValue by calculating the median speed of all * Update the _thresholdSpeedValue by calculating the average speed of all
* high capacity peers. * high capacity peers.
* *
* @param reordered ordered set of PeerProfile objects, ordered by capacity * @param reordered ordered set of PeerProfile objects, ordered by capacity
@ -1186,11 +1186,14 @@ public class ProfileOrganizer {
private void locked_calculateSpeedThresholdMean(Set<PeerProfile> reordered) { private void locked_calculateSpeedThresholdMean(Set<PeerProfile> reordered) {
double total = 0; double total = 0;
int count = 0; int count = 0;
int maxHighCapPeers = getMaximumHighCapPeers();
for (PeerProfile profile : reordered) { for (PeerProfile profile : reordered) {
if (profile.getCapacityValue() >= _thresholdCapacityValue) { if (profile.getCapacityValue() >= _thresholdCapacityValue) {
// duplicates being clobbered is fine by us // duplicates being clobbered is fine by us
total += profile.getSpeedValue(); total += profile.getSpeedValue();
count++; count++;
if (count >= maxHighCapPeers)
break;
} else { } else {
// its ordered // its ordered
break; break;