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

add router.memoryUsed stat

Browse Source
This commit is contained in:
zzz
2008-12-20 01:00:53 +00:00
parent 847c9dafce
commit 2d86e7cf60
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java
View File

@ -54,6 +54,7 @@ public class StatSummarizer implements Runnable {
// ",udp.receivePacketSkew.60000" + // ",udp.receivePacketSkew.60000" +
// ",udp.sendConfirmTime.60000" + // ",udp.sendConfirmTime.60000" +
// ",udp.sendPacketSize.60000" + // ",udp.sendPacketSize.60000" +
",router.memoryUsed.60000" +
",router.activePeers.60000"; ",router.activePeers.60000";
// ",router.activeSendPeers.60000" + // ",router.activeSendPeers.60000" +
// ",tunnel.acceptLoad.60000" + // ",tunnel.acceptLoad.60000" +

2
apps/routerconsole/java/src/net/i2p/router/web/SummaryListener.java
View File

@ -184,7 +184,7 @@ class SummaryRenderer {
def.setTimePeriod(start/1000, 0); def.setTimePeriod(start/1000, 0);
String name = _listener.getRate().getRateStat().getName(); String name = _listener.getRate().getRateStat().getName();
// heuristic to set K=1024 // heuristic to set K=1024
if ((name.startsWith("bw.") || name.indexOf("Size") >= 0 || name.indexOf("Bps") >= 0) if ((name.startsWith("bw.") || name.indexOf("Size") >= 0 || name.indexOf("Bps") >= 0 || name.indexOf("memory") >= 0)
&& !showEvents) && !showEvents)
def.setBaseValue(1024); def.setBaseValue(1024);
String title = name; String title = name;

5
router/java/src/net/i2p/router/Router.java
View File

@ -1215,6 +1215,8 @@ class CoalesceStatsEvent implements SimpleTimer.TimedEvent {
ctx.statManager().createRateStat("router.activeSendPeers", "How many peers we've sent to this minute", "Throttle", new long[] { 60*1000, 5*60*1000, 60*60*1000 }); ctx.statManager().createRateStat("router.activeSendPeers", "How many peers we've sent to this minute", "Throttle", new long[] { 60*1000, 5*60*1000, 60*60*1000 });
ctx.statManager().createRateStat("router.highCapacityPeers", "How many high capacity peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 }); ctx.statManager().createRateStat("router.highCapacityPeers", "How many high capacity peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 });
ctx.statManager().createRateStat("router.fastPeers", "How many fast peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 }); ctx.statManager().createRateStat("router.fastPeers", "How many fast peers we know", "Throttle", new long[] { 5*60*1000, 60*60*1000 });
long max = Runtime.getRuntime().maxMemory() / (1024*1024);
ctx.statManager().createRateStat("router.memoryUsed", "(Bytes) Max is " + max + "MB", "Router", new long[] { 60*1000 });
} }
private RouterContext getContext() { return _ctx; } private RouterContext getContext() { return _ctx; }
public void timeReached() { public void timeReached() {
@ -1233,6 +1235,9 @@ class CoalesceStatsEvent implements SimpleTimer.TimedEvent {
getContext().statManager().addRateData("bw.sendRate", (long)getContext().bandwidthLimiter().getSendBps(), 0); getContext().statManager().addRateData("bw.sendRate", (long)getContext().bandwidthLimiter().getSendBps(), 0);
getContext().statManager().addRateData("bw.recvRate", (long)getContext().bandwidthLimiter().getReceiveBps(), 0); getContext().statManager().addRateData("bw.recvRate", (long)getContext().bandwidthLimiter().getReceiveBps(), 0);
long used = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
getContext().statManager().addRateData("router.memoryUsed", used, 0);
getContext().tunnelDispatcher().updateParticipatingStats(); getContext().tunnelDispatcher().updateParticipatingStats();
getContext().statManager().coalesceStats(); getContext().statManager().coalesceStats();