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

* NetDB: Hopefully fix ISJ deadlock, thx dream

Browse Source
This commit is contained in:
zzz
2011-09-02 17:25:26 +00:00
parent b2263efaf0
commit 3d3352438b
5 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
history.txt
View File

@@ -1,3 +1,7 @@
2011-09-02 zzz
* Console: Cache user-agent processing
* NetDB: Hopefully fix ISJ deadlock, thx dream
2011-09-02 sponge
* I2PSnark: Fix GUI html tag for adding a torrent, it was missing a space.

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 = 8;
public final static long BUILD = 9;
/** for example "-test" */
public final static String EXTRA = "";

13
router/java/src/net/i2p/router/networkdb/kademlia/FloodOnlySearchJob.java
View File

@@ -221,12 +221,10 @@ class FloodOnlySearchJob extends FloodSearchJob {
}
_facade.complete(_key);
getContext().statManager().addRateData("netDb.failedTime", time, 0);
synchronized (_onFailed) {
for (int i = 0; i < _onFailed.size(); i++) {
Job j = _onFailed.remove(0);
getContext().jobQueue().addJob(j);
}
for (Job j : _onFailed) {
getContext().jobQueue().addJob(j);
}
_onFailed.clear();
}
@Override
@@ -254,9 +252,8 @@ class FloodOnlySearchJob extends FloodSearchJob {
}
_facade.complete(_key);
getContext().statManager().addRateData("netDb.successTime", time, 0);
synchronized (_onFind) {
while (!_onFind.isEmpty())
getContext().jobQueue().addJob(_onFind.remove(0));
for (Job j : _onFind) {
getContext().jobQueue().addJob(j);
}
}
}

35
router/java/src/net/i2p/router/networkdb/kademlia/FloodSearchJob.java
View File

@@ -1,7 +1,7 @@
package net.i2p.router.networkdb.kademlia;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import net.i2p.data.Hash;
import net.i2p.data.i2np.DatabaseLookupMessage;
@@ -41,15 +41,21 @@ public class FloodSearchJob extends JobImpl {
protected volatile boolean _dead;
protected final long _created;
/**
* @param onFind may be null
* @param onFailed may be null
*/
public FloodSearchJob(RouterContext ctx, FloodfillNetworkDatabaseFacade facade, Hash key, Job onFind, Job onFailed, int timeoutMs, boolean isLease) {
super(ctx);
_log = ctx.logManager().getLog(getClass());
_facade = facade;
_key = key;
_onFind = new ArrayList(4);
_onFind.add(onFind);
_onFailed = new ArrayList(4);
_onFailed.add(onFailed);
_onFind = new CopyOnWriteArrayList();
if (onFind != null)
_onFind.add(onFind);
_onFailed = new CopyOnWriteArrayList();
if (onFailed != null)
_onFailed.add(onFailed);
int timeout = timeoutMs / FLOOD_SEARCH_TIME_FACTOR;
if (timeout < timeoutMs)
timeout = timeoutMs;
@@ -64,14 +70,23 @@ public class FloodSearchJob extends JobImpl {
/**
* Add jobs to an existing search
* @param onFind may be null
* @param onFailed may be null
* @param timeoutMs ignored
* @param isLease ignored
*/
void addDeferred(Job onFind, Job onFailed, long timeoutMs, boolean isLease) {
if (_dead) {
getContext().jobQueue().addJob(onFailed);
} else {
if (onFind != null) synchronized (_onFind) { _onFind.add(onFind); }
if (onFailed != null) synchronized (_onFailed) { _onFailed.add(onFailed); }
synchronized (this) {
if (!_dead) {
if (onFind != null)
_onFind.add(onFind);
if (onFailed != null)
_onFailed.add(onFailed);
return;
}
}
// outside synch to avoid deadlock with job queue
getContext().jobQueue().addJob(onFailed);
}
/** using context clock */

14
router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
View File

@@ -320,12 +320,10 @@ class IterativeSearchJob extends FloodSearchJob {
}
getContext().statManager().addRateData("netDb.failedTime", time, 0);
getContext().statManager().addRateData("netDb.retries", Math.max(0, tries - 1), 0);
synchronized (_onFailed) {
for (int i = 0; i < _onFailed.size(); i++) {
Job j = _onFailed.remove(0);
getContext().jobQueue().addJob(j);
}
for (Job j : _onFailed) {
getContext().jobQueue().addJob(j);
}
_onFailed.clear();
}
@Override
@@ -356,9 +354,9 @@ class IterativeSearchJob extends FloodSearchJob {
", peers queried: " + tries);
getContext().statManager().addRateData("netDb.successTime", time, 0);
getContext().statManager().addRateData("netDb.retries", tries - 1, 0);
synchronized (_onFind) {
while (!_onFind.isEmpty())
getContext().jobQueue().addJob(_onFind.remove(0));
for (Job j : _onFind) {
getContext().jobQueue().addJob(j);
}
_onFind.clear();
}
}