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

Report average tx and rx rates, effective in next release

Browse Source
This commit is contained in:
zzz
2009-06-01 19:55:36 +00:00
parent 3ccbf37b41
commit 56dc96de1e
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
router/java/src/net/i2p/router/StatisticsManager.java
View File

@ -87,9 +87,14 @@ public class StatisticsManager implements Service {
if (_includePeerRankings) { if (_includePeerRankings) {
long publishedUptime = _context.router().getUptime(); long publishedUptime = _context.router().getUptime();
boolean commentOutIn074 = RouterVersion.VERSION.equals("0.7.3");
// Don't publish these for first hour // Don't publish these for first hour
if (publishedUptime > 60*60*1000) if (publishedUptime > 62*60*1000) {
includeThroughput(stats); if (commentOutIn074)
includeThroughput(stats);
else
includeAverageThroughput(stats);
}
//includeRate("router.invalidMessageTime", stats, new long[] { 10*60*1000 }); //includeRate("router.invalidMessageTime", stats, new long[] { 10*60*1000 });
//includeRate("router.duplicateMessageId", stats, new long[] { 24*60*60*1000 }); //includeRate("router.duplicateMessageId", stats, new long[] { 24*60*60*1000 });
//includeRate("tunnel.duplicateIV", stats, new long[] { 24*60*60*1000 }); //includeRate("tunnel.duplicateIV", stats, new long[] { 24*60*60*1000 });
@ -223,16 +228,26 @@ public class StatisticsManager implements Service {
return buf.toString(); return buf.toString();
} }
/* report the same data for tx and rx, for enhanced anonymity */
private void includeAverageThroughput(Properties stats) {
RateStat sendRate = _context.statManager().getRate("bw.sendRate");
RateStat recvRate = _context.statManager().getRate("bw.recvRate");
if (sendRate == null || recvRate == null)
return;
Rate s = sendRate.getRate(60*60*1000);
Rate r = recvRate.getRate(60*60*1000);
if (s == null || r == null)
return;
double speed = (s.getAverageValue() + r.getAverageValue()) / 2;
double max = Math.max(s.getExtremeAverageValue(), r.getExtremeAverageValue());
String str = num(speed) + ';' + num(max) + ";0;0;";
stats.setProperty("stat_bandwidthSendBps.60m", str);
stats.setProperty("stat_bandwidthReceiveBps.60m", str);
}
private void includeThroughput(Properties stats) { private void includeThroughput(Properties stats) {
RateStat sendRate = _context.statManager().getRate("bw.sendRate"); RateStat sendRate = _context.statManager().getRate("bw.sendRate");
if (sendRate != null) { if (sendRate != null) {
/****
if (_context.router().getUptime() > 5*60*1000) {
Rate r = sendRate.getRate(5*60*1000);
if (r != null)
stats.setProperty("stat_bandwidthSendBps.5m", num(r.getAverageValue()) + ';' + num(r.getExtremeAverageValue()) + ";0;0;");
}
****/
if (_context.router().getUptime() > 60*60*1000) { if (_context.router().getUptime() > 60*60*1000) {
Rate r = sendRate.getRate(60*60*1000); Rate r = sendRate.getRate(60*60*1000);
if (r != null) if (r != null)
@ -242,13 +257,6 @@ public class StatisticsManager implements Service {
RateStat recvRate = _context.statManager().getRate("bw.recvRate"); RateStat recvRate = _context.statManager().getRate("bw.recvRate");
if (recvRate != null) { if (recvRate != null) {
/****
if (_context.router().getUptime() > 5*60*1000) {
Rate r = recvRate.getRate(5*60*1000);
if (r != null)
stats.setProperty("stat_bandwidthReceiveBps.5m", num(r.getAverageValue()) + ';' + num(r.getExtremeAverageValue()) + ";0;0;");
}
****/
if (_context.router().getUptime() > 60*60*1000) { if (_context.router().getUptime() > 60*60*1000) {
Rate r = recvRate.getRate(60*60*1000); Rate r = recvRate.getRate(60*60*1000);
if (r != null) if (r != null)