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

remove FlushTimer

Browse Source
This commit is contained in:
zzz
2012-03-22 19:55:40 +00:00
parent bafef846d9
commit cae94320b5
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
router/java/src/net/i2p/router/tunnel/FlushTimer.java
View File

@@ -1,17 +0,0 @@
package net.i2p.router.tunnel;
import net.i2p.util.SimpleTimer;
/**
*
*/
class FlushTimer extends SimpleTimer {
/*
Streaming lib has been moved from SimpleTimer to SimpleTimer2, eliminating the congestion.
So there's not much left using SimpleTimer, and FlushTimer doesn't need its own 4 threads any more
(if it ever did?...)
*/
//private static final FlushTimer _instance = new FlushTimer();
//public static final SimpleTimer getInstance() { return _instance; }
//protected FlushTimer() { super("TunnelFlushTimer"); }
}

2
router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
View File

@@ -121,7 +121,7 @@ class PumpedTunnelGateway extends TunnelGateway {
} }
if (delayedFlush) { if (delayedFlush) {
FlushTimer.getInstance().addEvent(_delayedFlush, delayAmount); _context.simpleTimer().addEvent(_delayedFlush, delayAmount);
} }
_context.statManager().addRateData("tunnel.lockedGatewayAdd", afterAdded-beforeLock, remaining); _context.statManager().addRateData("tunnel.lockedGatewayAdd", afterAdded-beforeLock, remaining);
long complete = System.currentTimeMillis(); long complete = System.currentTimeMillis();

4
router/java/src/net/i2p/router/tunnel/TunnelGateway.java
View File

@@ -124,7 +124,7 @@ class TunnelGateway {
} }
if (delayedFlush) { if (delayedFlush) {
FlushTimer.getInstance().addEvent(_delayedFlush, delayAmount); _context.simpleTimer().addEvent(_delayedFlush, delayAmount);
} }
_context.statManager().addRateData("tunnel.lockedGatewayAdd", afterAdded-beforeLock, remaining); _context.statManager().addRateData("tunnel.lockedGatewayAdd", afterAdded-beforeLock, remaining);
if (_log.shouldLog(Log.DEBUG)) { if (_log.shouldLog(Log.DEBUG)) {
@@ -304,7 +304,7 @@ class TunnelGateway {
} }
if (wantRequeue) if (wantRequeue)
FlushTimer.getInstance().addEvent(_delayedFlush, delayAmount); _context.simpleTimer().addEvent(_delayedFlush, delayAmount);
else else
_lastFlush = _context.clock().now(); _lastFlush = _context.clock().now();