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

unchoke new peer faster

Browse Source
This commit is contained in:
zzz
2014-12-15 14:43:37 +00:00
parent ab4f209c10
commit 96db43cc8e
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
View File

@@ -25,14 +25,14 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Deque;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Queue;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingDeque;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.data.ByteArray; import net.i2p.data.ByteArray;
@@ -52,7 +52,7 @@ import org.klomp.snark.dht.DHT;
*/ */
class PeerCoordinator implements PeerListener class PeerCoordinator implements PeerListener
{ {
private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(PeerCoordinator.class); private final Log _log;
/** /**
* External use by PeerMonitorTask only. * External use by PeerMonitorTask only.
@@ -98,7 +98,7 @@ class PeerCoordinator implements PeerListener
* This is a Queue, not a Set, because PeerCheckerTask keeps things in order for choking/unchoking. * This is a Queue, not a Set, because PeerCheckerTask keeps things in order for choking/unchoking.
* External use by PeerMonitorTask only. * External use by PeerMonitorTask only.
*/ */
final Queue<Peer> peers; final Deque<Peer> peers;
/** /**
* Peers we heard about via PEX * Peers we heard about via PEX
@@ -144,6 +144,7 @@ class PeerCoordinator implements PeerListener
{ {
_util = util; _util = util;
_random = util.getContext().random(); _random = util.getContext().random();
_log = util.getContext().logManager().getLog(PeerCoordinator.class);
this.id = id; this.id = id;
this.infohash = infohash; this.infohash = infohash;
this.metainfo = metainfo; this.metainfo = metainfo;
@@ -154,7 +155,7 @@ class PeerCoordinator implements PeerListener
wantedPieces = new ArrayList<Piece>(); wantedPieces = new ArrayList<Piece>();
setWantedPieces(); setWantedPieces();
partialPieces = new ArrayList<PartialPiece>(getMaxConnections() + 1); partialPieces = new ArrayList<PartialPiece>(getMaxConnections() + 1);
peers = new LinkedBlockingQueue<Peer>(); peers = new LinkedBlockingDeque<Peer>();
magnetState = new MagnetState(infohash, metainfo); magnetState = new MagnetState(infohash, metainfo);
pexPeers = new ConcurrentHashSet<PeerID>(); pexPeers = new ConcurrentHashSet<PeerID>();
@@ -522,7 +523,10 @@ class PeerCoordinator implements PeerListener
// Can't add to beginning since we converted from a List to a Queue // Can't add to beginning since we converted from a List to a Queue
// We can do this in Java 6 with a Deque // We can do this in Java 6 with a Deque
//peers.add(0, peer); //peers.add(0, peer);
peers.add(peer); if (_util.getContext().random().nextInt(4) == 0)
peers.push(peer);
else
peers.add(peer);
peerCount = peers.size(); peerCount = peers.size();
unchokePeer(); unchokePeer();