I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Tunnel Pool:

Browse Source 
- Prevent excess zero-hop tunnels
      - Always wait before looping in BuildExecutor
This commit is contained in:
zzz
2008-09-15 16:21:23 +00:00
parent fcfe4397c4
commit 69d9c054d8
2 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java
View File

@ -221,15 +221,15 @@ class BuildExecutor implements Runnable {
int pendingRemaining = 0; int pendingRemaining = 0;
long loopBegin = 0; //long loopBegin = 0;
long beforeHandleInboundReplies = 0; //long beforeHandleInboundReplies = 0;
long afterHandleInboundReplies = 0; //long afterHandleInboundReplies = 0;
long afterBuildZeroHop = 0; //long afterBuildZeroHop = 0;
long afterBuildReal = 0; long afterBuildReal = 0;
long afterHandleInbound = 0; long afterHandleInbound = 0;
while (!_manager.isShutdown()){ while (!_manager.isShutdown()){
loopBegin = System.currentTimeMillis(); //loopBegin = System.currentTimeMillis();
try { try {
_repoll = pendingRemaining > 0; // resets repoll to false unless there are inbound requeusts pending _repoll = pendingRemaining > 0; // resets repoll to false unless there are inbound requeusts pending
_manager.listPools(pools); _manager.listPools(pools);
@ -242,9 +242,9 @@ class BuildExecutor implements Runnable {
wanted.add(pool); wanted.add(pool);
} }
beforeHandleInboundReplies = System.currentTimeMillis(); //beforeHandleInboundReplies = System.currentTimeMillis();
_handler.handleInboundReplies(); _handler.handleInboundReplies();
afterHandleInboundReplies = System.currentTimeMillis(); //afterHandleInboundReplies = System.currentTimeMillis();
// allowed() also expires timed out requests (for new style requests) // allowed() also expires timed out requests (for new style requests)
int allowed = allowed(); int allowed = allowed();
@ -254,7 +254,7 @@ class BuildExecutor implements Runnable {
// zero hop ones can run inline // zero hop ones can run inline
allowed = buildZeroHopTunnels(wanted, allowed); allowed = buildZeroHopTunnels(wanted, allowed);
afterBuildZeroHop = System.currentTimeMillis(); //afterBuildZeroHop = System.currentTimeMillis();
//if (_log.shouldLog(Log.DEBUG)) //if (_log.shouldLog(Log.DEBUG))
// _log.debug("Zero hops built, Allowed: " + allowed + " wanted: " + wanted); // _log.debug("Zero hops built, Allowed: " + allowed + " wanted: " + wanted);
@ -286,6 +286,14 @@ class BuildExecutor implements Runnable {
// continue; // continue;
PooledTunnelCreatorConfig cfg = pool.configureNewTunnel(); PooledTunnelCreatorConfig cfg = pool.configureNewTunnel();
if (cfg != null) { if (cfg != null) {
// 0hops are taken care of above, these are nonstandard 0hops
if (cfg.getLength() <= 1 && !pool.needFallback()) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("We don't need more fallbacks for " + pool);
i--; //0hop, we can keep going, as there's no worry about throttling
pool.buildComplete(cfg);
continue;
}
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Configuring new tunnel " + i + " for " + pool + ": " + cfg); _log.debug("Configuring new tunnel " + i + " for " + pool + ": " + cfg);
synchronized (_currentlyBuilding) { synchronized (_currentlyBuilding) {
@ -293,9 +301,6 @@ class BuildExecutor implements Runnable {
} }
buildTunnel(pool, cfg); buildTunnel(pool, cfg);
realBuilt++; realBuilt++;
// 0hops are taken care of above, these are nonstandard 0hops
//if (cfg.getLength() <= 1)
// i--; //0hop, we can keep going, as there's no worry about throttling
// we want replies to go to the top of the queue // we want replies to go to the top of the queue
_handler.handleInboundReplies(); _handler.handleInboundReplies();
@ -303,14 +308,15 @@ class BuildExecutor implements Runnable {
i--; i--;
} }
} }
} else { }
// wait whether we built tunnels or not
try { try {
synchronized (_currentlyBuilding) { synchronized (_currentlyBuilding) {
if (!_repoll) { if (!_repoll) {
//if (_log.shouldLog(Log.DEBUG)) //if (_log.shouldLog(Log.DEBUG))
// _log.debug("Nothin' doin (allowed=" + allowed + ", wanted=" + wanted.size() + ", pending=" + pendingRemaining + "), wait for a while"); // _log.debug("Nothin' doin (allowed=" + allowed + ", wanted=" + wanted.size() + ", pending=" + pendingRemaining + "), wait for a while");
//if (allowed <= 0) //if (allowed <= 0)
_currentlyBuilding.wait(_context.random().nextInt(2*1000)); _currentlyBuilding.wait(2000 + _context.random().nextInt(2*1000));
//else // wanted <= 0 //else // wanted <= 0
// _currentlyBuilding.wait(_context.random().nextInt(30*1000)); // _currentlyBuilding.wait(_context.random().nextInt(30*1000));
} }
@ -318,7 +324,6 @@ class BuildExecutor implements Runnable {
} catch (InterruptedException ie) { } catch (InterruptedException ie) {
// someone wanted to build something // someone wanted to build something
} }
}
} }
afterBuildReal = System.currentTimeMillis(); afterBuildReal = System.currentTimeMillis();

17
router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
View File

@ -233,6 +233,23 @@ public class TunnelPool {
} }
} }
/**
* Do we really need more fallbacks?
* Used to prevent a zillion of them
*/
public boolean needFallback() {
int needed = _settings.getBackupQuantity() + _settings.getQuantity();
int fallbacks = 0;
synchronized (_tunnels) {
for (int i = 0; i < _tunnels.size(); i++) {
TunnelInfo info = (TunnelInfo)_tunnels.get(i);
if (info.getLength() <= 1 && ++fallbacks >= needed)
return false;
}
}
return true;
}
/** list of tunnelInfo instances of tunnels currently being built */ /** list of tunnelInfo instances of tunnels currently being built */
public List listPending() { synchronized (_inProgress) { return new ArrayList(_inProgress); } } public List listPending() { synchronized (_inProgress) { return new ArrayList(_inProgress); } }