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

Console: Fix lifetime participating bandwidth display (ticket #1706)

Browse Source 
Add locking to HopConfig counts
Split participatingMessageCount stat into two stats,
participatingMessageCountAvgPerTunnel for throttle (same as old participatingMessagecount)
and participatingMessageCount for console (straight total)
Fix calculation of stat for throttle by adjusting for new
stat coalesce time (50 not 20 seconds)
This commit is contained in:
zzz
2015-11-13 21:18:21 +00:00
parent a028bba997
commit 8a1f02aa89
6 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
View File

@ -81,12 +81,13 @@ public class TunnelRenderer {
int displayed = 0;
for (int i = 0; i < participating.size(); i++) {
HopConfig cfg = participating.get(i);
long count = cfg.getProcessedMessagesCount();
int count = cfg.getProcessedMessagesCount();
if (count <= 0) {
inactive++;
continue;
}
processed += count;
// everything that isn't 'recent' is already in the tunnel.participatingMessageCount stat
processed += cfg.getRecentMessagesCount();
if (++displayed > DISPLAY_LIMIT)
continue;
out.write("<tr>");
@ -111,13 +112,13 @@ public class TunnelRenderer {
out.write("<td class=\"cells\" align=\"center\">" + DataHelper.formatDuration2(timeLeft) + "</td>");
else
out.write("<td class=\"cells\" align=\"center\">(" + _t("grace period") + ")</td>");
out.write("<td class=\"cells\" align=\"center\">" + cfg.getProcessedMessagesCount() + " KB</td>");
out.write("<td class=\"cells\" align=\"center\">" + count + " KB</td>");
int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000);
if (lifetime <= 0)
lifetime = 1;
if (lifetime > 10*60)
lifetime = 10*60;
int bps = 1024 * cfg.getProcessedMessagesCount() / lifetime;
int bps = 1024 * count / lifetime;
out.write("<td class=\"cells\" align=\"center\">" + bps + " Bps</td>");
if (cfg.getSendTo() == null)
out.write("<td class=\"cells\" align=\"center\">" + _t("Outbound Endpoint") + "</td>");
@ -188,7 +189,8 @@ public class TunnelRenderer {
else
out.write("<tr> <td class=\"cells\" align=\"center\"><img src=\"/themes/console/images/outbound.png\" alt=\"Outbound\" title=\"Outbound\"></td>");
out.write(" <td class=\"cells\" align=\"center\">" + DataHelper.formatDuration2(timeLeft) + "</td>\n");
out.write(" <td class=\"cells\" align=\"center\">" + info.getProcessedMessagesCount() + " KB</td>\n");
int count = info.getProcessedMessagesCount();
out.write(" <td class=\"cells\" align=\"center\">" + count + " KB</td>\n");
for (int j = 0; j < info.getLength(); j++) {
Hash peer = info.getPeer(j);
TunnelId id = (info.isInbound() ? info.getReceiveTunnelId(j) : info.getSendTunnelId(j));
@ -206,9 +208,9 @@ public class TunnelRenderer {
out.write("</tr>\n");
if (info.isInbound())
processedIn += info.getProcessedMessagesCount();
processedIn += count;
else
processedOut += info.getProcessedMessagesCount();
processedOut += count;
}
out.write("</table>\n");
if (in != null) {