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

NetDB: Don't auto-ff if ARM or ElG decrypt is too slow

Browse Source
This commit is contained in:
zzz
2014-09-18 14:48:08 +00:00
parent ec2708a1fd
commit bc463f6d0b
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
View File

@ -10,7 +10,10 @@ import net.i2p.router.Router;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import net.i2p.router.peermanager.PeerProfile; import net.i2p.router.peermanager.PeerProfile;
import net.i2p.router.util.EventLog; import net.i2p.router.util.EventLog;
import net.i2p.stat.Rate;
import net.i2p.stat.RateStat;
import net.i2p.util.Log; import net.i2p.util.Log;
import net.i2p.util.SystemVersion;
/** /**
* Simple job to monitor the floodfill pool. * Simple job to monitor the floodfill pool.
@ -78,6 +81,10 @@ class FloodfillMonitorJob extends JobImpl {
// auto from here down // auto from here down
// ARM ElG decrypt is too slow
if (SystemVersion.isARM())
return false;
// Only if up a while... // Only if up a while...
if (getContext().router().getUptime() < MIN_UPTIME) if (getContext().router().getUptime() < MIN_UPTIME)
return false; return false;
@ -148,12 +155,22 @@ class FloodfillMonitorJob extends JobImpl {
happy = false; happy = false;
} }
} }
double elG = 0;
RateStat stat = getContext().statManager().getRate("crypto.elGamal.decrypt");
if (stat != null) {
Rate rate = stat.getRate(60*60*1000L);
if (rate != null) {
elG = rate.getAvgOrLifetimeAvg();
happy = happy && elG <= 40.0d;
}
}
if (_log.shouldLog(Log.DEBUG)) { if (_log.shouldLog(Log.DEBUG)) {
final RouterContext rc = getContext(); final RouterContext rc = getContext();
final String log = String.format( final String log = String.format(
"FF criteria breakdown: happy=%b, capabilities=%s, maxLag=%d, known=%d, " + "FF criteria breakdown: happy=%b, capabilities=%s, maxLag=%d, known=%d, " +
"active=%d, participating=%d, offset=%d, ssuAddr=%s", "active=%d, participating=%d, offset=%d, ssuAddr=%s ElG=%f",
happy, happy,
rc.router().getRouterInfo().getCapabilities(), rc.router().getRouterInfo().getCapabilities(),
rc.jobQueue().getMaxLag(), rc.jobQueue().getMaxLag(),
@ -161,7 +178,8 @@ class FloodfillMonitorJob extends JobImpl {
rc.commSystem().countActivePeers(), rc.commSystem().countActivePeers(),
rc.tunnelManager().getParticipatingCount(), rc.tunnelManager().getParticipatingCount(),
Math.abs(rc.clock().getOffset()), Math.abs(rc.clock().getOffset()),
rc.router().getRouterInfo().getTargetAddress("SSU").toString() rc.router().getRouterInfo().getTargetAddress("SSU").toString(),
elG
); );
_log.debug(log); _log.debug(log);
} }