diff --git a/history.txt b/history.txt index 7daa8e514..d81f6f6d1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-03-13 dg + * Router: create router.integratedPeers (floodfills) stat, and + allow graphing of it. + 2015-03-08 zzz * i2psnark: Increase min and default bandwidth * Throttle: Tweak messages during probabalistic rejection diff --git a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java index 668536de3..817847835 100644 --- a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java +++ b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java @@ -38,6 +38,7 @@ public class CoalesceStatsEvent implements SimpleTimer.TimedEvent { ctx.statManager().createRequiredRateStat("router.highCapacityPeers", "How many high capacity peers we know", "Throttle", new long[] { 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().createRequiredRateStat("router.fastPeers", _x("Known fast peers"), "Throttle", new long[] { 5*60*1000, 60*60*1000 }); + ctx.statManager().createRateStat("router.integratedPeers", _x("Known integrated (floodfill) peers"), "Throttle", new long[] { 60*1000, 5*60*1000, 60*60*1000 }); _maxMemory = Runtime.getRuntime().maxMemory(); String legend = "(Bytes)"; if (_maxMemory < Long.MAX_VALUE) @@ -61,6 +62,9 @@ public class CoalesceStatsEvent implements SimpleTimer.TimedEvent { int highCap = getContext().profileOrganizer().countHighCapacityPeers(); getContext().statManager().addRateData("router.highCapacityPeers", highCap, 60*1000); + int integrated = getContext().peerManager().getPeersByCapability('f').size(); + getContext().statManager().addRateData("router.integratedPeers", integrated, 60*1000); + getContext().statManager().addRateData("bw.sendRate", (long)getContext().bandwidthLimiter().getSendBps()); getContext().statManager().addRateData("bw.recvRate", (long)getContext().bandwidthLimiter().getReceiveBps());