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

Simplify oldstats.jsp if no events in a stat

Browse Source
This commit is contained in:
zzz
2008-05-10 14:28:37 +00:00
parent 3a203c3018
commit 4c2c5ca232
2 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/src/net/i2p/stat/RateStat.java
View File

@ -72,7 +72,7 @@ public class RateStat {
if ( (_rates == null) || (_rates.length <= 0) ) return 0; if ( (_rates == null) || (_rates.length <= 0) ) return 0;
return _rates[0].getLifetimeAverageValue(); return _rates[0].getLifetimeAverageValue();
} }
public double getLifetimeEventCount() { public long getLifetimeEventCount() {
if ( (_rates == null) || (_rates.length <= 0) ) return 0; if ( (_rates == null) || (_rates.length <= 0) ) return 0;
return _rates[0].getLifetimeEventCount(); return _rates[0].getLifetimeEventCount();
} }

36
router/java/src/net/i2p/router/admin/StatsGenerator.java
View File

@ -98,9 +98,12 @@ public class StatsGenerator {
buf.append("<i>"); buf.append("<i>");
buf.append(freq.getDescription()); buf.append(freq.getDescription());
buf.append("</i><br />"); buf.append("</i><br />");
long uptime = _context.router().getUptime();
long periods[] = freq.getPeriods(); long periods[] = freq.getPeriods();
Arrays.sort(periods); Arrays.sort(periods);
for (int i = 0; i < periods.length; i++) { for (int i = 0; i < periods.length; i++) {
if (periods[i] > uptime)
break;
renderPeriod(buf, periods[i], "frequency"); renderPeriod(buf, periods[i], "frequency");
Frequency curFreq = freq.getFrequency(periods[i]); Frequency curFreq = freq.getFrequency(periods[i]);
buf.append(" <i>avg per period:</i> ("); buf.append(" <i>avg per period:</i> (");
@ -128,16 +131,27 @@ public class StatsGenerator {
private void renderRate(String name, StringBuffer buf) { private void renderRate(String name, StringBuffer buf) {
RateStat rate = _context.statManager().getRate(name); RateStat rate = _context.statManager().getRate(name);
String d = rate.getDescription();
if (! "".equals(d)) {
buf.append("<i>"); buf.append("<i>");
buf.append(rate.getDescription()); buf.append(d);
buf.append("</i><br />"); buf.append("</i><br />");
}
if (rate.getLifetimeEventCount() <= 0) {
buf.append("No lifetime events<br />&nbsp;<br />");
return;
}
long now = _context.clock().now();
long periods[] = rate.getPeriods(); long periods[] = rate.getPeriods();
Arrays.sort(periods); Arrays.sort(periods);
buf.append("<ul>"); buf.append("<ul>");
for (int i = 0; i < periods.length; i++) { for (int i = 0; i < periods.length; i++) {
Rate curRate = rate.getRate(periods[i]);
if (curRate.getLastCoalesceDate() <= curRate.getCreationDate())
break;
buf.append("<li>"); buf.append("<li>");
renderPeriod(buf, periods[i], "rate"); renderPeriod(buf, periods[i], "rate");
Rate curRate = rate.getRate(periods[i]); if (curRate.getLastEventCount() > 0) {
buf.append( "<i>avg value:</i> ("); buf.append( "<i>avg value:</i> (");
buf.append(num(curRate.getAverageValue())); buf.append(num(curRate.getAverageValue()));
buf.append(" peak "); buf.append(" peak ");
@ -167,8 +181,14 @@ public class StatsGenerator {
buf.append(num(curRate.getExtremeSaturationLimit())); buf.append(num(curRate.getExtremeSaturationLimit()));
buf.append(")"); buf.append(")");
} }
buf.append(" <i>events per period:</i> "); buf.append(" <i>events:</i> ");
buf.append(curRate.getLastEventCount()); buf.append(curRate.getLastEventCount());
buf.append(" <i>in this period which ended:</i> ");
buf.append(DataHelper.formatDuration(now - curRate.getLastCoalesceDate()));
buf.append(" ago ");
} else {
buf.append(" <i>No events</i> ");
}
long numPeriods = curRate.getLifetimePeriods(); long numPeriods = curRate.getLifetimePeriods();
if (numPeriods > 0) { if (numPeriods > 0) {
double avgFrequency = curRate.getLifetimeEventCount() / (double)numPeriods; double avgFrequency = curRate.getLifetimeEventCount() / (double)numPeriods;
@ -191,15 +211,13 @@ public class StatsGenerator {
buf.append(" in a format <a href=\"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool\">RRDTool</a> understands)"); buf.append(" in a format <a href=\"http://people.ee.ethz.ch/~oetiker/webtools/rrdtool\">RRDTool</a> understands)");
} }
buf.append("</li>"); buf.append("</li>");
if (i + 1 == periods.length) { }
// last one, so lets display the strict average // Display the strict average
buf.append("<li><b>lifetime average value:</b> "); buf.append("<li><b>lifetime average value:</b> ");
buf.append(num(curRate.getLifetimeAverageValue())); buf.append(num(rate.getLifetimeAverageValue()));
buf.append(" over "); buf.append(" over ");
buf.append(curRate.getLifetimeEventCount()); buf.append(rate.getLifetimeEventCount());
buf.append(" events<br /></li>"); buf.append(" events<br /></li>");
}
}
buf.append("</ul>"); buf.append("</ul>");
buf.append("<br />"); buf.append("<br />");
} }