mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2024-11-19 09:50:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Orchid deadlock 1

Browse Source 
https://github.com/subgraph/Orchid/pull/10
This commit is contained in:
Devrandom 2014-08-22 11:15:27 -07:00 committed by Mike Hearn
parent 46104903fb
commit 00d1821daa
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
orchid/src/com/subgraph/orchid/circuits/CircuitIO.java
View File

@ -37,8 +37,10 @@ public class CircuitIO implements DashboardRenderable {
private final BlockingQueue<Cell> controlCellResponseQueue;
private final Map<Integer, StreamImpl> streamMap;
private final Object relaySendLock = new Object();
/** LOCKING: streamMap */
private boolean isMarkedForClose;
/** LOCKING: streamMap */
private boolean isClosed;
CircuitIO(CircuitImpl circuit, Connection connection, int circuitId) {
@ -233,19 +235,22 @@ public class CircuitIO implements DashboardRenderable {
}
void markForClose() {
boolean shouldClose;
synchronized (streamMap) {
if(isMarkedForClose) {
return;
}
isMarkedForClose = true;
if(streamMap.isEmpty()) {
closeCircuit();
}
shouldClose = streamMap.isEmpty();
}
if(shouldClose)
closeCircuit();
}
boolean isMarkedForClose() {
return isMarkedForClose;
synchronized (streamMap) {
return isMarkedForClose;
}
}
private void closeCircuit() {
@ -295,12 +300,13 @@ public class CircuitIO implements DashboardRenderable {
}
void removeStream(StreamImpl stream) {
boolean shouldClose;
synchronized(streamMap) {
streamMap.remove(stream.getStreamId());
if(streamMap.isEmpty() && isMarkedForClose) {
closeCircuit();
}
shouldClose = streamMap.isEmpty() && isMarkedForClose;
}
if(shouldClose)
closeCircuit();
}
List<Stream> getActiveStreams() {