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

i2psnark: Another place to send reject; switch to LBQ

Browse Source
This commit is contained in:
zzz
2015-05-19 23:21:18 +00:00
parent 65ff2c0afe
commit 29330aa5d3
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
View File

@ -22,9 +22,10 @@ package org.klomp.snark;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
@ -42,7 +43,7 @@ class PeerConnectionOut implements Runnable
private boolean quit; private boolean quit;
// Contains Messages. // Contains Messages.
private final List<Message> sendQueue = new ArrayList<Message>(); private final BlockingQueue<Message> sendQueue = new LinkedBlockingQueue<Message>();
private static final AtomicLong __id = new AtomicLong(); private static final AtomicLong __id = new AtomicLong();
private final long _id; private final long _id;
@ -124,6 +125,16 @@ class PeerConnectionOut implements Runnable
if (state.choking) { if (state.choking) {
it.remove(); it.remove();
//SimpleTimer.getInstance().removeEvent(nm.expireEvent); //SimpleTimer.getInstance().removeEvent(nm.expireEvent);
if (peer.supportsFast()) {
Message r = new Message();
r.type = Message.REJECT;
r.piece = nm.piece;
r.begin = nm.begin;
r.length = nm.length;
if (_log.shouldLog(Log.DEBUG))
_log.debug("Send " + peer + ": " + r);
r.sendMessage(dout);
}
} }
nm = null; nm = null;
} }
@ -141,8 +152,8 @@ class PeerConnectionOut implements Runnable
it.remove(); it.remove();
} }
} }
if (m == null && !sendQueue.isEmpty()) { if (m == null) {
m = sendQueue.remove(0); m = sendQueue.poll();
//SimpleTimer.getInstance().removeEvent(m.expireEvent); //SimpleTimer.getInstance().removeEvent(m.expireEvent);
} }
} }
@ -233,7 +244,7 @@ class PeerConnectionOut implements Runnable
{ {
synchronized(sendQueue) synchronized(sendQueue)
{ {
sendQueue.add(m); sendQueue.offer(m);
sendQueue.notifyAll(); sendQueue.notifyAll();
} }
} }
@ -307,7 +318,7 @@ class PeerConnectionOut implements Runnable
synchronized(sendQueue) synchronized(sendQueue)
{ {
if(sendQueue.isEmpty()) if(sendQueue.isEmpty())
sendQueue.add(m); sendQueue.offer(m);
sendQueue.notifyAll(); sendQueue.notifyAll();
} }
} }