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

* TunnelPoolManager: Reduce race window for restarting a tunnel pool

Browse Source
This commit is contained in:
zzz
2011-07-28 18:26:21 +00:00
parent 59e1fbd0d1
commit b37813257a
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
history.txt
View File

@ -1,3 +1,8 @@
2011-07-28 zzz
* Context: Split up big lock to avoid deadlocks
* Streaming: Avoid a rare exception on race
* TunnelPoolManager: Reduce race window for restarting a tunnel pool
2011-07-27 kytv
* Add armel (armv5tejl) wrapper. Compiled and tested in Debian Squeeze.

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 15;
public final static long BUILD = 16;
/** for example "-test" */
public final static String EXTRA = "";

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

@ -33,7 +33,7 @@ public class TunnelPool {
private final List<TunnelInfo> _tunnels;
private final TunnelPeerSelector _peerSelector;
private final TunnelPoolManager _manager;
private boolean _alive;
private volatile boolean _alive;
private long _lifetimeProcessed;
private TunnelInfo _lastSelected;
private long _lastSelectionPeriod;
@ -64,7 +64,8 @@ public class TunnelPool {
* Warning, this may be called more than once
* (without an intervening shutdown()) if the
* tunnel is stopped and then restarted by the client manager with the same
* Destination (i.e. for servers or clients w/ persistent key)
* Destination (i.e. for servers or clients w/ persistent key,
* or restarting close-on-idle clients)
*/
void startup() {
synchronized (_inProgress) {
@ -362,6 +363,7 @@ public class TunnelPool {
if (getTunnelCount() <= 0 && !isAlive()) {
// this calls both our shutdown() and the other one (inbound/outbound)
// This is racy - see TunnelPoolManager
_manager.removeTunnels(_settings.getDestination());
}
}

15
router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java
View File

@ -286,6 +286,7 @@ public class TunnelPoolManager implements TunnelManagerFacade {
// should we share the clientPeerSelector across both inbound and outbound?
// or just one for all clients? why separate?
boolean delayOutbound = false;
// synch with removeTunnels() below
synchronized (this) {
inbound = _clientInboundPools.get(dest);
@ -301,12 +302,18 @@ public class TunnelPoolManager implements TunnelManagerFacade {
outbound = new TunnelPool(_context, this, settings.getOutboundSettings(),
new ClientPeerSelector());
_clientOutboundPools.put(dest, outbound);
delayOutbound = true;
} else {
outbound.setSettings(settings.getOutboundSettings());
}
}
inbound.startup();
SimpleScheduler.getInstance().addEvent(new DelayedStartup(outbound), 3*1000);
// don't delay the outbound if it already exists, as this opens up a large
// race window with removeTunnels() below
if (delayOutbound)
SimpleScheduler.getInstance().addEvent(new DelayedStartup(outbound), 1000);
else
outbound.startup();
}
@ -331,8 +338,10 @@ public class TunnelPoolManager implements TunnelManagerFacade {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Removing tunnels for the client " + destination);
if (_context.clientManager().isLocal(destination)) {
if (_log.shouldLog(Log.CRIT))
_log.log(Log.CRIT, "wtf, why are you removing the pool for " + destination.toBase64(), new Exception("i did it"));
// race with buildTunnels() on restart of a client
if (_log.shouldLog(Log.ERROR))
_log.error("Not removing pool still registered with client manager: " + destination.toBase64(), new Exception("i did it"));
return;
}
TunnelPool inbound = _clientInboundPools.remove(destination);
TunnelPool outbound = _clientOutboundPools.remove(destination);