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

Console: show 'none' if no leases

Browse Source 
log timing for /netdb (ticket #1532)
This commit is contained in:
zzz
2015-09-27 15:53:37 +00:00
parent 3ea8b477d8
commit 4d7ad6ef7f
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
View File

@@ -35,6 +35,7 @@ import net.i2p.router.RouterContext;
import net.i2p.router.TunnelPoolSettings; import net.i2p.router.TunnelPoolSettings;
import net.i2p.router.util.HashDistance; // debug import net.i2p.router.util.HashDistance; // debug
import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
import net.i2p.util.Log;
import net.i2p.util.ObjectCounter; import net.i2p.util.ObjectCounter;
import net.i2p.util.Translate; import net.i2p.util.Translate;
import net.i2p.util.VersionComparator; import net.i2p.util.VersionComparator;
@@ -141,16 +142,20 @@ public class NetDbRenderer {
int rapCount = 0; int rapCount = 0;
BigInteger median = null; BigInteger median = null;
int c = 0; int c = 0;
if (debug) { if (leases.isEmpty()) {
if (!debug)
buf.append("<i>").append(_t("none")).append("</i>");
} else {
if (debug) {
// Find the center of the RAP leasesets // Find the center of the RAP leasesets
for (LeaseSet ls : leases) { for (LeaseSet ls : leases) {
if (ls.getReceivedAsPublished()) if (ls.getReceivedAsPublished())
rapCount++; rapCount++;
} }
medianCount = rapCount / 2; medianCount = rapCount / 2;
} }
long now = _context.clock().now(); long now = _context.clock().now();
for (LeaseSet ls : leases) { for (LeaseSet ls : leases) {
Destination dest = ls.getDestination(); Destination dest = ls.getDestination();
Hash key = dest.calculateHash(); Hash key = dest.calculateHash();
buf.append("<b>").append(_t("LeaseSet")).append(": ").append(key.toBase64()).append("</b>\n"); buf.append("<b>").append(_t("LeaseSet")).append(": ").append(key.toBase64()).append("</b>\n");
@@ -223,7 +228,8 @@ public class NetDbRenderer {
buf.append("<hr>\n"); buf.append("<hr>\n");
out.write(buf.toString()); out.write(buf.toString());
buf.setLength(0); buf.setLength(0);
} } // for each
} // !empty
if (debug) { if (debug) {
FloodfillNetworkDatabaseFacade netdb = (FloodfillNetworkDatabaseFacade)_context.netDb(); FloodfillNetworkDatabaseFacade netdb = (FloodfillNetworkDatabaseFacade)_context.netDb();
buf.append("<p><b>Total Leasesets: ").append(leases.size()); buf.append("<p><b>Total Leasesets: ").append(leases.size());
@@ -281,6 +287,8 @@ public class NetDbRenderer {
out.flush(); out.flush();
return; return;
} }
Log log = _context.logManager().getLog(NetDbRenderer.class);
long start = System.currentTimeMillis();
boolean full = mode == 1; boolean full = mode == 1;
boolean shortStats = mode == 2; boolean shortStats = mode == 2;
@@ -319,6 +327,10 @@ public class NetDbRenderer {
transportCount[classifyTransports(ri)]++; transportCount[classifyTransports(ri)]++;
} }
} }
long end = System.currentTimeMillis();
if (log.shouldWarn())
log.warn("part 1 took " + (end - start));
start = end;
// //
// don't bother to reindent // don't bother to reindent
@@ -346,6 +358,10 @@ public class NetDbRenderer {
buf.append("</td><td style=\"vertical-align: top;\">"); buf.append("</td><td style=\"vertical-align: top;\">");
out.write(buf.toString()); out.write(buf.toString());
buf.setLength(0); buf.setLength(0);
end = System.currentTimeMillis();
if (log.shouldWarn())
log.warn("part 2 took " + (end - start));
start = end;
// transports table // transports table
buf.append("<table>\n"); buf.append("<table>\n");
@@ -361,6 +377,10 @@ public class NetDbRenderer {
buf.append("</td><td style=\"vertical-align: top;\">"); buf.append("</td><td style=\"vertical-align: top;\">");
out.write(buf.toString()); out.write(buf.toString());
buf.setLength(0); buf.setLength(0);
end = System.currentTimeMillis();
if (log.shouldWarn())
log.warn("part 3 took " + (end - start));
start = end;
// country table // country table
List<String> countryList = new ArrayList<String>(countries.objects()); List<String> countryList = new ArrayList<String>(countries.objects());
@@ -379,6 +399,10 @@ public class NetDbRenderer {
} }
buf.append("</td></tr></table>"); buf.append("</td></tr></table>");
end = System.currentTimeMillis();
if (log.shouldWarn())
log.warn("part 4 took " + (end - start));
start = end;
// //
// don't bother to reindent // don't bother to reindent