I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add some stats for the simulator (data doesnt seem that interesting, so i havent moved them to the CommSystemImpl)

Browse Source 
use the .discardData() functionality
This commit is contained in:
jrandom
2004-06-20 00:53:19 +00:00
committed by zzz
parent 4e5a2e012c
commit f25bccd19f
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
router/java/src/net/i2p/router/transport/VMCommSystem.java
View File

@ -36,6 +36,12 @@ public class VMCommSystem extends CommSystemFacade {
_context.statManager().createFrequencyStat("transport.sendMessageFailureFrequency", "How often do we fail to send messages?", "Transport", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); _context.statManager().createFrequencyStat("transport.sendMessageFailureFrequency", "How often do we fail to send messages?", "Transport", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.sendMessageSize", "How large are the messages sent?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("transport.sendMessageSize", "How large are the messages sent?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.receiveMessageSize", "How large are the messages received?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("transport.receiveMessageSize", "How large are the messages received?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.sendMessageSmall", "How many messages under 1KB are sent?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.receiveMessageSmall", "How many messages under 1KB are received?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.sendMessageMedium", "How many messages between 1KB and 4KB are sent?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.receiveMessageMedium", "How many messages between 1KB and 4KB are received?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.sendMessageLarge", "How many messages over 4KB are sent?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.receiveMessageLarge", "How many messages over 4KB are received?", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
_context.statManager().createRateStat("transport.sendProcessingTime", "How long does it take from noticing that we want to send the message to having it completely sent (successfully or failed)?", "Transport", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l }); _context.statManager().createRateStat("transport.sendProcessingTime", "How long does it take from noticing that we want to send the message to having it completely sent (successfully or failed)?", "Transport", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l });
} }
@ -61,6 +67,14 @@ public class VMCommSystem extends CommSystemFacade {
_context.profileManager().messageSent(msg.getTarget().getIdentity().getHash(), "vm", sendTime, msg.getMessageSize()); _context.profileManager().messageSent(msg.getTarget().getIdentity().getHash(), "vm", sendTime, msg.getMessageSize());
byte data[] = msg.getMessageData(); byte data[] = msg.getMessageData();
_context.statManager().addRateData("transport.sendMessageSize", data.length, sendTime); _context.statManager().addRateData("transport.sendMessageSize", data.length, sendTime);
if (data.length < 1024)
_context.statManager().addRateData("transport.sendMessageSmall", 1, sendTime);
else if (data.length <= 4096)
_context.statManager().addRateData("transport.sendMessageMedium", 1, sendTime);
else
_context.statManager().addRateData("transport.sendMessageLarge", 1, sendTime);
peerSys.receive(data, _context.routerHash()); peerSys.receive(data, _context.routerHash());
//_context.jobQueue().addJob(new SendJob(peerSys, msg.getMessage(), _context)); //_context.jobQueue().addJob(new SendJob(peerSys, msg.getMessage(), _context));
sendSuccessful = true; sendSuccessful = true;
@ -72,6 +86,8 @@ public class VMCommSystem extends CommSystemFacade {
_context.messageHistory().sendMessage(type, dmsg.getUniqueId(), dmsg.getMessageExpiration(), msg.getTarget().getIdentity().getHash(), sendSuccessful); _context.messageHistory().sendMessage(type, dmsg.getUniqueId(), dmsg.getMessageExpiration(), msg.getTarget().getIdentity().getHash(), sendSuccessful);
} }
msg.discardData();
_context.statManager().addRateData("transport.sendProcessingTime", msg.getLifetime(), msg.getLifetime()); _context.statManager().addRateData("transport.sendProcessingTime", msg.getLifetime(), msg.getLifetime());
} }
@ -92,11 +108,19 @@ public class VMCommSystem extends CommSystemFacade {
try { try {
I2NPMessage msg = handler.readMessage(new ByteArrayInputStream(_msg)); I2NPMessage msg = handler.readMessage(new ByteArrayInputStream(_msg));
int size = _msg.length; int size = _msg.length;
InNetMessage inMsg = new InNetMessage(); InNetMessage inMsg = new InNetMessage(ReceiveJob.this._context);
inMsg.setFromRouterHash(_from); inMsg.setFromRouterHash(_from);
inMsg.setMessage(msg); inMsg.setMessage(msg);
_ctx.profileManager().messageReceived(_from, "vm", 1, size); _ctx.profileManager().messageReceived(_from, "vm", 1, size);
_ctx.statManager().addRateData("transport.receiveMessageSize", size, 1); _ctx.statManager().addRateData("transport.receiveMessageSize", size, 1);
if (size < 1024)
ReceiveJob.this._context.statManager().addRateData("transport.receiveMessageSmall", 1, 1);
else if (size <= 4096)
ReceiveJob.this._context.statManager().addRateData("transport.receiveMessageMedium", 1, 1);
else
ReceiveJob.this._context.statManager().addRateData("transport.receiveMessageLarge", 1, 1);
_ctx.inNetMessagePool().add(inMsg); _ctx.inNetMessagePool().add(inMsg);
} catch (Exception e) { } catch (Exception e) {
_log.error("wtf, error reading/formatting a VM message?", e); _log.error("wtf, error reading/formatting a VM message?", e);