echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
4a9f7b740c74a4bf20e9753d67a712b4e249de86
i2p.i2p/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

364 lines
18 KiB
Java
Raw Normal View History

* ProfileOrganizerRenderer: - Move to routerconsole - Write directly to Writer for speed
2009-10-15 22:42:22 +00:00
package net.i2p.router.web;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
import java.io.IOException;
* updated stats: - sendsPerFailure: how many partial sends we make when they all fail - timeoutCongestionInbound: describes how much faster than our average speed we were receiving data when each partial send timed out (in Bps) - timeoutCongestionMessage: our send processing time when each partial send timed out (in ms) - timeoutCongestionTunnel: our tunnel test time when each partial send timed out (in ms) - participatingMessagesProcessedActive: # of messages more than the (most recent) average that a tunnel we were participating in transmitted (for tunnels with more than the average) * updated to use Writer for rendering the console, so we can do partial writes (and hopefully help debug some kooky threading bugs on kaffe)
2004-09-29 22:49:19 +00:00
import java.io.Writer;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
import java.text.DecimalFormat;
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
import java.util.Comparator;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
import java.util.Iterator;
import java.util.Set;
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
import java.util.TreeSet;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
import net.i2p.data.DataHelper;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
import net.i2p.data.Hash;
Display capabilities on profiles.jsp
2008-02-19 15:32:39 +00:00
import net.i2p.data.RouterInfo;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
import net.i2p.router.RouterContext;
* ProfileOrganizerRenderer: - Move to routerconsole - Write directly to Writer for speed
2009-10-15 22:42:22 +00:00
import net.i2p.router.peermanager.DBHistory;
import net.i2p.router.peermanager.PeerProfile;
import net.i2p.router.peermanager.ProfileOrganizer;
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
import net.i2p.stat.Rate;
import net.i2p.stat.RateStat;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
/**
* Helper class to refactor the HTML rendering from out of the ProfileOrganizer
*
*/
class ProfileOrganizerRenderer {
private RouterContext _context;
private ProfileOrganizer _organizer;
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
private ProfileComparator _comparator;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
public ProfileOrganizerRenderer(ProfileOrganizer organizer, RouterContext context) {
_context = context;
_organizer = organizer;
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
_comparator = new ProfileComparator();
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
public void renderStatusHTML(Writer out, boolean full) throws IOException {
cleanups
2010-01-24 15:34:40 +00:00
Set<Hash> peers = _organizer.selectAllPeers();
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
long now = _context.clock().now();
* profiles.jsp: - Rename the Failing column - Reduce the time cutoff again to 90m (was 2h)
2009-08-19 15:26:35 +00:00
long hideBefore = now - 90*60*1000;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
cleanups
2010-01-24 15:34:40 +00:00
TreeSet<PeerProfile> order = new TreeSet(_comparator);
TreeSet<PeerProfile> integratedPeers = new TreeSet(_comparator);
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
int older = 0;
int standard = 0;
cleanups
2010-01-24 15:34:40 +00:00
for (Iterator<Hash> iter = peers.iterator(); iter.hasNext();) {
Hash peer = iter.next();
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
if (_organizer.getUs().equals(peer)) continue;
PeerProfile prof = _organizer.getProfile(peer);
profiles.jsp: Hide non-ff from ff table
2009-11-29 18:48:03 +00:00
//if (_organizer.isWellIntegrated(peer)) {
// integratedPeers.add(prof);
//} else {
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
if (info != null && info.getCapabilities().indexOf("f") >= 0)
integratedPeers.add(prof);
profiles.jsp: Hide non-ff from ff table
2009-11-29 18:48:03 +00:00
//}
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
if (prof.getLastSendSuccessful() <= hideBefore) {
older++;
continue;
}
if ((!full) && !_organizer.isHighCapacity(peer)) {
standard++;
continue;
}
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
order.add(prof);
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
int fast = 0;
int reliable = 0;
int integrated = 0;
int failing = 0;
* Move almost all uses of StringBuffer to StringBuilder, for efficiency (thanks Arsene for the suggestion)
2009-07-01 16:00:43 +00:00
StringBuilder buf = new StringBuilder(16*1024);
tag and trans convert append(""+""+"") to append().append().append()
2009-10-29 09:03:32 +00:00
buf.append("<h2>").append(_("Peer Profiles")).append("</h2>\n<p>");
* Console: - Add parameterized tag - Refactor confignav.jsp to java and tag - Start tagging profiles.jsp
2009-10-26 14:24:25 +00:00
buf.append(_("Showing {0} recent profiles.", order.size())).append('\n');
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
if (older > 0)
buf.append(_("Hiding {0} older profiles.", older)).append('\n');
if (standard > 0)
bye .jsp part 2
2010-11-17 22:26:31 +00:00
buf.append("<a href=\"/profiles?f=1\">").append(_("Hiding {0} standard profiles.", standard)).append("</a>\n");
tag and trans convert append(""+""+"") to append().append().append()
2009-10-29 09:03:32 +00:00
buf.append("</p>");
buf.append("<table>");
buf.append("<tr>");
buf.append("<th>").append(_("Peer")).append("</th>");
buf.append("<th>").append(_("Groups (Caps)")).append("</th>");
buf.append("<th>").append(_("Speed")).append("</th>");
buf.append("<th>").append(_("Capacity")).append("</th>");
buf.append("<th>").append(_("Integration")).append("</th>");
buf.append("<th>").append(_("Status")).append("</th>");
buf.append("<th>&nbsp;</th>");
buf.append("</tr>");
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
int prevTier = 1;
cleanups
2010-01-24 15:34:40 +00:00
for (Iterator<PeerProfile> iter = order.iterator(); iter.hasNext();) {
PeerProfile prof = iter.next();
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
Hash peer = prof.getPeer();
int tier = 0;
boolean isIntegrated = false;
if (_organizer.isFast(peer)) {
tier = 1;
fast++;
reliable++;
} else if (_organizer.isHighCapacity(peer)) {
tier = 2;
reliable++;
} else if (_organizer.isFailing(peer)) {
failing++;
} else {
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
tier = 3;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
if (_organizer.isWellIntegrated(peer)) {
isIntegrated = true;
integrated++;
}
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
if (tier != prevTier)
Replace all <hr /> and <br /> with <hr> and <br> whilst we're in html4 transitional.
2009-08-17 14:35:18 +00:00
buf.append("<tr><td colspan=\"7\"><hr></td></tr>\n");
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
prevTier = tier;
Remove redundant html markup and refashion table display a la fois.
2009-07-28 13:06:19 +00:00
buf.append("<tr><td align=\"center\" nowrap>");
Add geoip support and flag icons
2009-05-19 18:07:19 +00:00
buf.append(_context.commSystem().renderPeerHTML(peer));
* Profiles: - Remove the almost-unused send and receive size RateStats; this also reduces the effective time for isActive() - Only store DB history on-demand to save space; fix up resulting NPEs
2009-11-02 16:50:28 +00:00
// debug
//if(prof.getIsExpandedDB())
// buf.append(" ** ");
Remove redundant html markup and refashion table display a la fois.
2009-07-28 13:06:19 +00:00
buf.append("</td><td align=\"center\">");
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
switch (tier) {
tag and trans convert append(""+""+"") to append().append().append()
2009-10-29 09:03:32 +00:00
case 1: buf.append(_("Fast, High Capacity")); break;
case 2: buf.append(_("High Capacity")); break;
more tagging and trans term rev [not failing] -> [Standard] 1 string(notice) with link still left in confstats
2009-10-30 14:04:58 +00:00
case 3: buf.append(_("Standard")); break;
tag and trans convert append(""+""+"") to append().append().append()
2009-10-29 09:03:32 +00:00
default: buf.append(_("Failing")); break;
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
tag and trans convert append(""+""+"") to append().append().append()
2009-10-29 09:03:32 +00:00
if (isIntegrated) buf.append(", ").append(_("Integrated"));
Display capabilities on profiles.jsp
2008-02-19 15:32:39 +00:00
RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
Add router version to profiles.jsp
2008-05-05 16:26:15 +00:00
if (info != null) {
* profiles.jsp: Bulletproofing, less memory usage * Updates: Verify zip at startup before extracting * Wrapper: Take a couple fields out of the log so it's narrower
2009-08-21 23:36:21 +00:00
// prevent HTML injection in the caps and version
buf.append(" (").append(DataHelper.stripHTML(info.getCapabilities()));
Add router version to profiles.jsp
2008-05-05 16:26:15 +00:00
String v = info.getOption("router.version");
if (v != null)
* profiles.jsp: Bulletproofing, less memory usage * Updates: Verify zip at startup before extracting * Wrapper: Take a couple fields out of the log so it's narrower
2009-08-21 23:36:21 +00:00
buf.append(' ').append(DataHelper.stripHTML(v));
Add router version to profiles.jsp
2008-05-05 16:26:15 +00:00
buf.append(')');
}
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
2005-03-14 jrandom * New strict speed calculator that goes off the actual number of messages verifiably sent through the peer by way of tunnels. Initially, this only contains the successful message count on inbound tunnels, but may be augmented later to include verified outbound messages, peers queried in the netDb, etc. The speed calculation decays quickly, but should give a better differential than the previous stat (both values are shown on the /profiles.jsp page)
2005-03-15 03:47:14 +00:00
buf.append("<td align=\"right\">").append(num(prof.getSpeedValue()));
* configpeer.jsp: New
2008-07-16 15:05:07 +00:00
long bonus = prof.getSpeedBonus();
if (bonus != 0) {
if (bonus > 0)
buf.append(" (+");
else
buf.append(" (");
buf.append(bonus).append(')');
}
buf.append("</td><td align=\"right\">").append(num(prof.getCapacityValue()));
bonus = prof.getCapacityBonus();
if (bonus != 0) {
if (bonus > 0)
buf.append(" (+");
else
buf.append(" (");
buf.append(bonus).append(')');
}
buf.append("</td><td align=\"right\">").append(num(prof.getIntegrationValue()));
Remove redundant html markup and refashion table display a la fois.
2009-07-28 13:06:19 +00:00
buf.append("</td><td align=\"center\">");
tag and trans convert append(""+""+"") to append().append().append()
2009-10-29 09:03:32 +00:00
if (_context.shitlist().isShitlisted(peer)) buf.append(_("Banned"));
tags
2009-11-03 20:37:21 +00:00
if (prof.getIsFailing()) buf.append(' ').append(_("Failing"));
if (_context.commSystem().wasUnreachable(peer)) buf.append(' ').append(_("Unreachable"));
* Reachability: - Call the previously unused profile.tunnelTestFailed() (redefined to include a probability argument) and severely downgrade a peer's capacity upon failures, depending on tunnel length and direction. This will help push unreachable and malicious peers out of the High Capacity tier. - Put recent fail rate on profiles.jsp * ProfileOrganizer: Logging cleanup * eepsite_index.html: Update add-host and jump links * HTTP Proxy: Remove trevorreznik jump server from list
2008-05-20 12:48:41 +00:00
Rate failed = prof.getTunnelHistory().getFailedRate().getRate(30*60*1000);
long fails = failed.getCurrentEventCount() + failed.getLastEventCount();
if (fails > 0) {
Rate accepted = prof.getTunnelCreateResponseTime().getRate(30*60*1000);
long total = fails + accepted.getCurrentEventCount() + accepted.getLastEventCount();
if (total / fails <= 10) // hide if < 10%
tags
2009-11-03 20:37:21 +00:00
buf.append(' ').append(fails).append('/').append(total).append(' ').append(_("Test Fails"));
* Reachability: - Call the previously unused profile.tunnelTestFailed() (redefined to include a probability argument) and severely downgrade a peer's capacity upon failures, depending on tunnel length and direction. This will help push unreachable and malicious peers out of the High Capacity tier. - Put recent fail rate on profiles.jsp * ProfileOrganizer: Logging cleanup * eepsite_index.html: Update add-host and jump links * HTTP Proxy: Remove trevorreznik jump server from list
2008-05-20 12:48:41 +00:00
}
Start of validation cleanup.
2009-08-17 13:24:08 +00:00
buf.append("&nbsp;</td>");
* Profiles: - Remove the almost-unused send and receive size RateStats; this also reduces the effective time for isActive() - Only store DB history on-demand to save space; fix up resulting NPEs
2009-11-02 16:50:28 +00:00
buf.append("<td nowrap align=\"center\"><a target=\"_blank\" href=\"dumpprofile.jsp?peer=")
.append(peer.toBase64().substring(0,6)).append("\">").append(_("profile")).append("</a>");
bye .jsp part 2
2010-11-17 22:26:31 +00:00
buf.append("&nbsp;<a href=\"configpeer?peer=").append(peer.toBase64()).append("\">+-</a></td>\n");
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
buf.append("</tr>");
* profiles.jsp: Bulletproofing, less memory usage * Updates: Verify zip at startup before extracting * Wrapper: Take a couple fields out of the log so it's narrower
2009-08-21 23:36:21 +00:00
// let's not build the whole page in memory (~500 bytes per peer)
out.write(buf.toString());
buf.setLength(0);
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
buf.append("</table>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
buf.append("<h2><a name=\"flood\"></a>").append(_("Floodfill and Integrated Peers")).append("</h2>\n");
tag and trans convert append(""+""+"") to append().append().append()
2009-10-29 09:03:32 +00:00
buf.append("<table>");
* Console: - countries.txt: Convert to mixed case, include in update - netdb.jsp: Hide all routers by default, sort and tag country names - oldstats.jsp: Move to stats.jsp - profiles.jsp: Show new DBH times instead of counts * Profiles: - Track last good and bad lookup times and last good and bad store times, to prep for floodfill changes - Don't reset last-heard-about at router startup * Checklist and Android readme fixups
2009-11-07 19:32:00 +00:00
buf.append("<tr>");
buf.append("<th class=\"smallhead\">").append(_("Peer")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Caps")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Integ. Value")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Heard About")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Heard From")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Good Send")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Bad Send")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("10m Resp. Time")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("1h Resp. Time")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("1d Resp. Time")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Good Lookup")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Bad Lookup")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Good Store")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("Last Bad Store")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("1h Fail Rate")).append("</th>");
buf.append("<th class=\"smallhead\">").append(_("1d Fail Rate")).append("</th>");
buf.append("</tr>");
cleanups
2010-01-24 15:34:40 +00:00
for (Iterator<PeerProfile> iter = integratedPeers.iterator(); iter.hasNext();) {
PeerProfile prof = iter.next();
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
Hash peer = prof.getPeer();
Remove redundant html markup and refashion table display a la fois.
2009-07-28 13:06:19 +00:00
buf.append("<tr><td align=\"center\" nowrap>");
Add geoip support and flag icons
2009-05-19 18:07:19 +00:00
buf.append(_context.commSystem().renderPeerHTML(peer));
buf.append("</td>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer);
if (info != null)
* profiles.jsp: Bulletproofing, less memory usage * Updates: Verify zip at startup before extracting * Wrapper: Take a couple fields out of the log so it's narrower
2009-08-21 23:36:21 +00:00
buf.append("<td align=\"center\">").append(DataHelper.stripHTML(info.getCapabilities())).append("</td>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
else
buf.append("<td>&nbsp;</td>");
buf.append("</code></td>");
buf.append("<td align=\"right\">").append(num(prof.getIntegrationValue())).append("</td>");
long time;
time = now - prof.getLastHeardAbout();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
time = now - prof.getLastHeardFrom();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
time = now - prof.getLastSendSuccessful();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
time = now - prof.getLastSendFailed();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
buf.append("<td align=\"right\">").append(avg(prof, 10*60*1000l)).append("</td>");
buf.append("<td align=\"right\">").append(avg(prof, 60*60*1000l)).append("</td>");
buf.append("<td align=\"right\">").append(avg(prof, 24*60*60*1000l)).append("</td>");
DBHistory dbh = prof.getDBHistory();
if (dbh != null) {
* Console: - countries.txt: Convert to mixed case, include in update - netdb.jsp: Hide all routers by default, sort and tag country names - oldstats.jsp: Move to stats.jsp - profiles.jsp: Show new DBH times instead of counts * Profiles: - Track last good and bad lookup times and last good and bad store times, to prep for floodfill changes - Don't reset last-heard-about at router startup * Checklist and Android readme fixups
2009-11-07 19:32:00 +00:00
time = now - dbh.getLastLookupSuccessful();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* Console: - countries.txt: Convert to mixed case, include in update - netdb.jsp: Hide all routers by default, sort and tag country names - oldstats.jsp: Move to stats.jsp - profiles.jsp: Show new DBH times instead of counts * Profiles: - Track last good and bad lookup times and last good and bad store times, to prep for floodfill changes - Don't reset last-heard-about at router startup * Checklist and Android readme fixups
2009-11-07 19:32:00 +00:00
time = now - dbh.getLastLookupFailed();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* Console: - countries.txt: Convert to mixed case, include in update - netdb.jsp: Hide all routers by default, sort and tag country names - oldstats.jsp: Move to stats.jsp - profiles.jsp: Show new DBH times instead of counts * Profiles: - Track last good and bad lookup times and last good and bad store times, to prep for floodfill changes - Don't reset last-heard-about at router startup * Checklist and Android readme fixups
2009-11-07 19:32:00 +00:00
time = now - dbh.getLastStoreSuccessful();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* Console: - countries.txt: Convert to mixed case, include in update - netdb.jsp: Hide all routers by default, sort and tag country names - oldstats.jsp: Move to stats.jsp - profiles.jsp: Show new DBH times instead of counts * Profiles: - Track last good and bad lookup times and last good and bad store times, to prep for floodfill changes - Don't reset last-heard-about at router startup * Checklist and Android readme fixups
2009-11-07 19:32:00 +00:00
time = now - dbh.getLastStoreFailed();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
buf.append("<td align=\"right\">").append(DataHelper.formatDuration2(time)).append("</td>");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
buf.append("<td align=\"right\">").append(davg(dbh, 60*60*1000l)).append("</td>");
buf.append("<td align=\"right\">").append(davg(dbh, 24*60*60*1000l)).append("</td>");
* Profiles: - Remove the almost-unused send and receive size RateStats; this also reduces the effective time for isActive() - Only store DB history on-demand to save space; fix up resulting NPEs
2009-11-02 16:50:28 +00:00
} else {
tags
2009-11-03 20:37:21 +00:00
for (int i = 0; i < 6; i++)
buf.append("<td align=\"right\">").append(_(NA));
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
}
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
buf.append("</tr>\n");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
}
buf.append("</table>");
* Console: Some colon cleansing * Shitlist: Move HTML renderer to router console, add cause parameter for ease of translation, tag all causes
2009-11-11 20:28:13 +00:00
buf.append("<h3>").append(_("Thresholds")).append("</h3>");
tags
2009-11-03 20:37:21 +00:00
buf.append("<p><b>").append(_("Speed")).append(":</b> ").append(num(_organizer.getSpeedThreshold()))
.append(" (").append(fast).append(' ').append(_("fast peers")).append(")<br>");
buf.append("<b>").append(_("Capacity")).append(":</b> ").append(num(_organizer.getCapacityThreshold()))
.append(" (").append(reliable).append(' ').append(_("high capacity peers")).append(")<br>");
buf.append("<b>").append(_("Integration")).append(":</b> ").append(num(_organizer.getIntegrationThreshold()))
.append(" (").append(integrated).append(' ').append(_(" well integrated peers")).append(")</p>");
* Console: Some colon cleansing * Shitlist: Move HTML renderer to router console, add cause parameter for ease of translation, tag all causes
2009-11-11 20:28:13 +00:00
buf.append("<h3>").append(_("Definitions")).append("</h3><ul>");
* Console: - countries.txt: Convert to mixed case, include in update - netdb.jsp: Hide all routers by default, sort and tag country names - oldstats.jsp: Move to stats.jsp - profiles.jsp: Show new DBH times instead of counts * Profiles: - Track last good and bad lookup times and last good and bad store times, to prep for floodfill changes - Don't reset last-heard-about at router startup * Checklist and Android readme fixups
2009-11-07 19:32:00 +00:00
buf.append("<li><b>").append(_("groups")).append("</b>: ").append(_("as determined by the profile organizer")).append("</li>");
buf.append("<li><b>").append(_("caps")).append("</b>: ").append(_("capabilities in the netDb, not used to determine profiles")).append("</li>");
buf.append("<li><b>").append(_("speed")).append("</b>: ").append(_("peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel")).append("</li>");
buf.append("<li><b>").append(_("capacity")).append("</b>: ").append(_("how many tunnels can we ask them to join in an hour?")).append("</li>");
buf.append("<li><b>").append(_("integration")).append("</b>: ").append(_("how many new peers have they told us about lately?")).append("</li>");
buf.append("<li><b>").append(_("status")).append("</b>: ").append(_("is the peer banned, or unreachable, or failing tunnel tests?")).append("</li>");
buf.append("</ul></i>");
* updated stats: - sendsPerFailure: how many partial sends we make when they all fail - timeoutCongestionInbound: describes how much faster than our average speed we were receiving data when each partial send timed out (in Bps) - timeoutCongestionMessage: our send processing time when each partial send timed out (in ms) - timeoutCongestionTunnel: our tunnel test time when each partial send timed out (in ms) - participatingMessagesProcessedActive: # of messages more than the (most recent) average that a tunnel we were participating in transmitted (for tunnels with more than the average) * updated to use Writer for rendering the console, so we can do partial writes (and hopefully help debug some kooky threading bugs on kaffe)
2004-09-29 22:49:19 +00:00
out.write(buf.toString());
* always flush the console output (duh) * deal with some degenerate situations with identities changing and auto IP detection * some catch-alls for cleaning up the registry on degenerate tunnels * lots of logging
2004-09-30 13:10:02 +00:00
out.flush();
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
cleanups
2010-01-24 15:34:40 +00:00
private class ProfileComparator implements Comparator<PeerProfile> {
public int compare(PeerProfile left, PeerProfile right) {
2005-03-16 jrandom * Adjust the old speed calculator to include end to end RTT data in its estimates, and use that as the primary speed calculator again. * Use the mean of the high capacity speeds to determine the fast threshold, rather than the median. Perhaps we should use the mean of all active non-failing peers? * Updated the profile page to sort by tier, then alphabetically. * Added some alternative socketManager factories (good call aum!)
2005-03-17 05:29:55 +00:00
if (_context.profileOrganizer().isFast(left.getPeer())) {
if (_context.profileOrganizer().isFast(right.getPeer())) {
return compareHashes(left, right);
} else {
return -1; // fast comes first
}
} else if (_context.profileOrganizer().isHighCapacity(left.getPeer())) {
if (_context.profileOrganizer().isFast(right.getPeer())) {
return 1;
} else if (_context.profileOrganizer().isHighCapacity(right.getPeer())) {
return compareHashes(left, right);
} else {
return -1;
}
} else if (_context.profileOrganizer().isFailing(left.getPeer())) {
if (_context.profileOrganizer().isFailing(right.getPeer())) {
return compareHashes(left, right);
} else {
return 1;
}
} else {
// left is not failing
if (_context.profileOrganizer().isFast(right.getPeer())) {
return 1;
} else if (_context.profileOrganizer().isHighCapacity(right.getPeer())) {
return 1;
} else if (_context.profileOrganizer().isFailing(right.getPeer())) {
return -1;
} else {
return compareHashes(left, right);
}
}
}
private int compareHashes(PeerProfile left, PeerProfile right) {
return left.getPeer().toBase64().compareTo(right.getPeer().toBase64());
}
}
* NetDb: - Update dbLookup profile stats in FloodOnlySearchJob and FloodfillVerifyStoreJob - Fix response time store in profile in SearchJob * profiles.jsp: Don't override locale number format, clean up the response time output for floodfills
2008-10-26 18:12:36 +00:00
private final static DecimalFormat _fmt = new DecimalFormat("###,##0.00");
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
private final static String num(double num) { synchronized (_fmt) { return _fmt.format(num); } }
tags
2009-11-03 20:37:21 +00:00
private final static String NA = HelperBase._x("n/a");
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
tags
2009-11-03 20:37:21 +00:00
private String avg (PeerProfile prof, long rate) {
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
RateStat rs = prof.getDbResponseTime();
if (rs == null)
tags
2009-11-03 20:37:21 +00:00
return _(NA);
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
Rate r = rs.getRate(rate);
if (r == null)
tags
2009-11-03 20:37:21 +00:00
return _(NA);
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
long c = r.getCurrentEventCount() + r.getLastEventCount();
if (c == 0)
tags
2009-11-03 20:37:21 +00:00
return _(NA);
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
double d = r.getCurrentTotalValue() + r.getLastTotalValue();
* Console: Display durations with new formatDuration2()
2010-11-06 12:28:38 +00:00
return DataHelper.formatDuration2(Math.round(d/c));
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
}
tags
2009-11-03 20:37:21 +00:00
private String davg (DBHistory dbh, long rate) {
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
RateStat rs = dbh.getFailedLookupRate();
if (rs == null)
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
return "0%";
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
Rate r = rs.getRate(rate);
if (r == null)
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
return "0%";
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
long c = r.getCurrentEventCount() + r.getLastEventCount();
* Profiles: Record successes in the DB fail rate too, so we can calculate a percentage * profiles.jsp: - Change fail rate from count to percent - Hide standard profiles by default
2009-11-24 20:20:30 +00:00
if (c <= 0)
return "0%";
double avg = 0.5 + 100 * (r.getCurrentTotalValue() + r.getLastTotalValue()) / c;
return ((int) avg) + "%";
* ExploratoryPeerSelector: Try NonFailing even more * HostsTxtNamingService: Add reverse lookup support * Outbound message: Minor cleanup * i2psnark TrackerCLient: Minor cleanup * checklist.txt: Minor edit * hosts.txt: Add perv.i2p, false.i2p, mtn.i2p2.i2p * i2ptunnel.config: Change CVS client to mtn * netdb.jsp: Show leaseSet destinations using reverse lookup * profiles.jsp: First cut at showing floodfill data
2008-03-30 21:50:35 +00:00
}
* Router Console translation infrastructure: - Persistent lang setting with routerconsole.lang=xx - Loading any page with ?lang=xx changes the persistent setting - Add a custom Jetty handler to load foo_xx.jsp if it exists for language xx. This is for jsp files with lots of text in them. Otherwise use inline translate methods. Not for included jsps. - Add a script to create and update messages_xx.po translation files, and create ResourceBundles from them - Add class to translate strings from cached ResourceBundles - Add translate wrappers to HelperBase, FormHandler, and *Renderer, so calls can be made from both jsp and java files - Add two example translations on configupdate.jsp - one in the jsp itself and one in the helper. - This is for strings in routerconsole only. Will be expanded to other webapps and the router later.
2009-10-18 14:06:07 +00:00
/** translate a string */
private String _(String s) {
return Messages.getString(s, _context);
}
* Console: - Add parameterized tag - Refactor confignav.jsp to java and tag - Start tagging profiles.jsp
2009-10-26 14:24:25 +00:00
/**
* translate a string with a parameter
* This is a lot more expensive than _(s), so use sparingly.
*
* @param s string to be translated containing {0}
* The {0} will be replaced by the parameter.
* Single quotes must be doubled, i.e. ' -> '' in the string.
* @param o parameter, not translated.
* To tranlslate parameter also, use _("foo {0} bar", _("baz"))
* Do not double the single quotes in the parameter.
* Use autoboxing to call with ints, longs, floats, etc.
*/
* Console: - Rewrite TrustedUpdate version comparator, use for netdb version table so 0.7.10 will be sorted correctly - Reduce netdb.jsp memory usage - More tagging fixups - configclients.jsp fixup for "Web console"
2009-10-28 18:26:50 +00:00
private String _(String s, Object o) {
* Console: - Add parameterized tag - Refactor confignav.jsp to java and tag - Start tagging profiles.jsp
2009-10-26 14:24:25 +00:00
return Messages.getString(s, o, _context);
}
2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded from a resource, and load them from that file on subsequent runs (in turn, we no longer *cough* delete the running libraries...) * Added support for a graceful restart. * Added new pseudo-shutdown hook specific to the router, allowing applications to request tasks to be run when the router shuts down. We use this for integration with the service manager, since otherwise a graceful shutdown would cause a timeout, followed by a forced hard shutdown. * Handle a bug in the SimpleTimer with requeued tasks. * Made the capacity calculator a bit more dynamic by not outright ignoring the otherwise valid capacity data for a period with a single rejected tunnel (except for the 10 minute period). In addition, peers with an equal capacity are ordered by speed rather than by their hashes. * Cleaned up the SimpleTimer, addressing some threading and synchronization issues. * When an I2PTunnel client or httpclient is explicitly closed, destroy the associated session (unless there are other clients using it), and deal with a closed session when starting a new I2PTunnel instance. * Refactoring and logging.
2004-09-07 07:17:02 +00:00
}
Reference in New Issue Copy Permalink