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

* SSU: Increase max concurrent outbound attempts;

Browse Source 
fix udp.establishRejected stat
This commit is contained in:
zzz
2011-10-17 17:25:10 +00:00
parent bff518a038
commit 0202faf7f9
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
View File

@ -50,8 +50,16 @@ class EstablishmentManager {
private final Object _activityLock; private final Object _activityLock;
private int _activity; private int _activity;
private static final int DEFAULT_MAX_CONCURRENT_ESTABLISH = 10; /** max outbound in progress */
public static final String PROP_MAX_CONCURRENT_ESTABLISH = "i2np.udp.maxConcurrentEstablish"; private static final int DEFAULT_MAX_CONCURRENT_ESTABLISH = 20;
private static final String PROP_MAX_CONCURRENT_ESTABLISH = "i2np.udp.maxConcurrentEstablish";
/** max pending outbound connections (waiting because we are at MAX_CONCURRENT_ESTABLISH) */
private static final int MAX_QUEUED_OUTBOUND = 50;
/** max queued msgs per peer while the peer connection is queued */
private static final int MAX_QUEUED_PER_PEER = 3;
public EstablishmentManager(RouterContext ctx, UDPTransport transport) { public EstablishmentManager(RouterContext ctx, UDPTransport transport) {
_context = ctx; _context = ctx;
@ -118,9 +126,6 @@ class EstablishmentManager {
return _context.getProperty(PROP_MAX_CONCURRENT_ESTABLISH, DEFAULT_MAX_CONCURRENT_ESTABLISH); return _context.getProperty(PROP_MAX_CONCURRENT_ESTABLISH, DEFAULT_MAX_CONCURRENT_ESTABLISH);
} }
private static final int MAX_QUEUED_OUTBOUND = 10*1000;
private static final int MAX_QUEUED_PER_PEER = 3;
/** /**
* Send the message to its specified recipient by establishing a connection * Send the message to its specified recipient by establishing a connection
* with them and sending it off. This call does not block, and on failure, * with them and sending it off. This call does not block, and on failure,
@ -181,8 +186,11 @@ class EstablishmentManager {
// There are still races possible but this should prevent AIOOBE and NPE // There are still races possible but this should prevent AIOOBE and NPE
synchronized (queued) { synchronized (queued) {
queueCount = queued.size(); queueCount = queued.size();
if (queueCount < MAX_QUEUED_PER_PEER) if (queueCount < MAX_QUEUED_PER_PEER) {
queued.add(msg); queued.add(msg);
// increment for the stat below
queueCount++;
}
deferred = _queuedOutbound.size(); deferred = _queuedOutbound.size();
} }
} }