I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Throttle: Combine current and last bw measurement,

Browse Source 
reduce default max tunnels to 2500 (was 3000)
This commit is contained in:
zzz
2008-09-06 13:48:25 +00:00
parent 808557d24f
commit a3108ead4a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
router/java/src/net/i2p/router/RouterThrottleImpl.java
View File

@ -31,7 +31,7 @@ class RouterThrottleImpl implements RouterThrottle {
private static int THROTTLE_EVENT_LIMIT = 30; private static int THROTTLE_EVENT_LIMIT = 30;
private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels"; private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels";
private static final String DEFAULT_MAX_TUNNELS = "3000"; // Unless share BW > 300KBps, BW limit will kick in first private static final String DEFAULT_MAX_TUNNELS = "2500"; // Unless share BW > 250KBps, BW limit will kick in first
private static final String PROP_DEFAULT_KBPS_THROTTLE = "router.defaultKBpsThrottle"; private static final String PROP_DEFAULT_KBPS_THROTTLE = "router.defaultKBpsThrottle";
/** tunnel acceptance */ /** tunnel acceptance */
@ -213,8 +213,9 @@ class RouterThrottleImpl implements RouterThrottle {
if (rs != null) { if (rs != null) {
r = rs.getRate(10*60*1000); r = rs.getRate(10*60*1000);
if (r != null) { if (r != null) {
if (r.getLastEventCount() > 0) long count = r.getLastEventCount() + r.getCurrentEventCount();
messagesPerTunnel = r.getAverageValue(); if (count > 0)
messagesPerTunnel = (r.getLastTotalValue() + r.getCurrentTotalValue()) / count;
else else
messagesPerTunnel = r.getLifetimeAverageValue(); messagesPerTunnel = r.getLifetimeAverageValue();
} }