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

NTCP stat cleanup

Browse Source
This commit is contained in:
zzz
2012-08-08 17:06:33 +00:00
parent 0451ee7f08
commit 37a542c009
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
View File

@@ -98,7 +98,7 @@ class EventPumper implements Runnable {
_transport = transport; _transport = transport;
_expireIdleWriteTime = MAX_EXPIRE_IDLE_TIME; _expireIdleWriteTime = MAX_EXPIRE_IDLE_TIME;
_context.statManager().createRateStat("ntcp.pumperKeySetSize", "", "ntcp", new long[] {10*60*1000} ); _context.statManager().createRateStat("ntcp.pumperKeySetSize", "", "ntcp", new long[] {10*60*1000} );
_context.statManager().createRateStat("ntcp.pumperKeysPerLoop", "", "ntcp", new long[] {10*60*1000} ); //_context.statManager().createRateStat("ntcp.pumperKeysPerLoop", "", "ntcp", new long[] {10*60*1000} );
_context.statManager().createRateStat("ntcp.pumperLoopsPerSecond", "", "ntcp", new long[] {10*60*1000} ); _context.statManager().createRateStat("ntcp.pumperLoopsPerSecond", "", "ntcp", new long[] {10*60*1000} );
_context.statManager().createRateStat("ntcp.zeroRead", "", "ntcp", new long[] {10*60*1000} ); _context.statManager().createRateStat("ntcp.zeroRead", "", "ntcp", new long[] {10*60*1000} );
_context.statManager().createRateStat("ntcp.zeroReadDrop", "", "ntcp", new long[] {10*60*1000} ); _context.statManager().createRateStat("ntcp.zeroReadDrop", "", "ntcp", new long[] {10*60*1000} );
@@ -175,7 +175,7 @@ class EventPumper implements Runnable {
//if (_log.shouldLog(Log.DEBUG)) //if (_log.shouldLog(Log.DEBUG))
// _log.debug("select returned " + count); // _log.debug("select returned " + count);
Set<SelectionKey> selected = _selector.selectedKeys(); Set<SelectionKey> selected = _selector.selectedKeys();
_context.statManager().addRateData("ntcp.pumperKeysPerLoop", selected.size()); //_context.statManager().addRateData("ntcp.pumperKeysPerLoop", selected.size());
processKeys(selected); processKeys(selected);
// does clear() do anything useful? // does clear() do anything useful?
selected.clear(); selected.clear();

9
router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java
View File

@@ -43,7 +43,7 @@ class NTCPSendFinisher {
_context = context; _context = context;
_log = _context.logManager().getLog(NTCPSendFinisher.class); _log = _context.logManager().getLog(NTCPSendFinisher.class);
_transport = transport; _transport = transport;
_context.statManager().createRateStat("ntcp.sendFinishTime", "How long to queue and excecute msg.afterSend()", "ntcp", new long[] {5*1000}); //_context.statManager().createRateStat("ntcp.sendFinishTime", "How long to queue and excecute msg.afterSend()", "ntcp", new long[] {5*1000});
} }
public void start() { public void start() {
@@ -88,17 +88,18 @@ class NTCPSendFinisher {
*/ */
private class RunnableEvent implements Runnable { private class RunnableEvent implements Runnable {
private final OutNetMessage _msg; private final OutNetMessage _msg;
private final long _queued; //private final long _queued;
public RunnableEvent(OutNetMessage msg) { public RunnableEvent(OutNetMessage msg) {
_msg = msg; _msg = msg;
_queued = _context.clock().now(); //_queued = _context.clock().now();
} }
public void run() { public void run() {
try { try {
_transport.afterSend(_msg, true, false, _msg.getSendTime()); _transport.afterSend(_msg, true, false, _msg.getSendTime());
_context.statManager().addRateData("ntcp.sendFinishTime", _context.clock().now() - _queued, 0); // appx 0.1 ms
//_context.statManager().addRateData("ntcp.sendFinishTime", _context.clock().now() - _queued, 0);
} catch (Throwable t) { } catch (Throwable t) {
_log.log(Log.CRIT, " wtf, afterSend borked", t); _log.log(Log.CRIT, " wtf, afterSend borked", t);
} }